about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--BUILD/VS2003/lynx/lynx.vcproj10
-rw-r--r--BUILD/VS2005X/lynx/lynx.vcproj12
-rw-r--r--BUILD/VS2008X/lynx/lynx.vcproj12
-rw-r--r--BUILD/VS6/lynx/lynx/lynx.dsp12
-rw-r--r--CHANGES36
-rw-r--r--PACKAGE/lynx-curses.iss4
-rw-r--r--WWW/FreeofCharge.html26
-rw-r--r--WWW/Library/Implementation/HTFile.c93
-rw-r--r--WWW/Library/Implementation/HTFile.h24
-rw-r--r--WWW/Library/Implementation/HTFormat.c22
-rw-r--r--WWW/Library/Implementation/HTMIME.c168
-rw-r--r--WWW/Library/Implementation/HTTCP.c32
-rw-r--r--WWW/Library/Implementation/HTUtils.h18
-rw-r--r--WWW/Library/Implementation/SGML.c4
-rw-r--r--aclocal.m486
-rwxr-xr-xconfig.guess156
-rw-r--r--config.hin3
-rwxr-xr-xconfig.sub47
-rwxr-xr-xconfigure6366
-rw-r--r--configure.in3
-rw-r--r--docs/CHANGES2.3458
-rw-r--r--docs/CHANGES2.4891
-rw-r--r--docs/CHANGES2.51696
-rw-r--r--docs/FM.announce72
-rw-r--r--docs/IBMPC-charsets.announce74
-rw-r--r--docs/SOCKETSHR.announce67
-rw-r--r--docs/djgpp.key214
-rw-r--r--docs/slang.key4
-rw-r--r--lynx.cfg7
-rw-r--r--lynx.hlp17
-rw-r--r--lynx.man17
-rw-r--r--lynx.rsp2
-rw-r--r--makefile.bcb15
-rw-r--r--makefile.msc11
-rw-r--r--po/ca.po389
-rw-r--r--po/cs.po392
-rw-r--r--po/da.po392
-rw-r--r--po/de.po392
-rw-r--r--po/et.po392
-rw-r--r--po/fr.po2184
-rw-r--r--po/hu.po392
-rw-r--r--po/it.po392
-rw-r--r--po/lynx.pot390
-rw-r--r--po/nl.po392
-rw-r--r--po/pt_BR.po387
-rw-r--r--po/ru.po392
-rw-r--r--po/rw.po6828
-rw-r--r--po/sl.po389
-rw-r--r--po/sv.po392
-rw-r--r--po/tr.po392
-rw-r--r--po/uk.po391
-rw-r--r--po/vi.po392
-rw-r--r--po/zh_CN.po386
-rw-r--r--po/zh_TW.po389
-rwxr-xr-xsamples/keepviewer20
-rw-r--r--samples/mime.types26
-rw-r--r--src/GridText.c49
-rw-r--r--src/LYCgi.c6
-rw-r--r--src/LYGlobalDefs.h7
-rw-r--r--src/LYJump.c8
-rw-r--r--src/LYLocal.c6
-rw-r--r--src/LYMain.c7
-rw-r--r--src/LYMainLoop.c14
-rw-r--r--src/LYNews.c7
-rw-r--r--src/LYReadCFG.c3
-rw-r--r--src/LYShowInfo.c7
-rw-r--r--src/LYUtils.c11
-rw-r--r--src/LYrcFile.h7
-rw-r--r--src/chrtrans/dmcs_uni.tbl233
-rw-r--r--src/chrtrans/hp_uni.tbl212
-rw-r--r--src/chrtrans/iso15_uni.tbl216
-rw-r--r--src/chrtrans/koi8u_uni.tbl154
-rw-r--r--src/chrtrans/mnem_suni.tbl1861
-rw-r--r--src/chrtrans/rfc_suni.tbl1958
-rw-r--r--src/chrtrans/utf8_uni.tbl35
-rw-r--r--src/chrtrans/viscii_uni.tbl300
-rw-r--r--src/parsdate.c6
-rw-r--r--src/parsdate.y6
78 files changed, 9158 insertions, 22725 deletions
diff --git a/BUILD/VS2003/lynx/lynx.vcproj b/BUILD/VS2003/lynx/lynx.vcproj
index 3d98537d..2b8c888c 100644
--- a/BUILD/VS2003/lynx/lynx.vcproj
+++ b/BUILD/VS2003/lynx/lynx.vcproj
@@ -20,7 +20,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories=".;..\..\..;..\..\..\lib;..\..\..\WWW\Library\Implementation;..\..\..\src\chrtrans;..\..\..\src"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE,HAVE_CONFIG_H"

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;DONT_HAVE_TM_GMTOFF"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="5"

@@ -71,7 +71,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories=".;..\..\..;..\..\..\lib;..\..\..\WWW\Library\Implementation;..\..\..\src\chrtrans;..\..\..\src"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE,HAVE_CONFIG_H"

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;DONT_HAVE_TM_GMTOFF"

 				RuntimeLibrary="4"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

@@ -314,6 +314,9 @@
 				RelativePath="..\..\..\src\LYMap.c">

 			</File>

 			<File

+				RelativePath="..\..\..\src\LYmktime.c">

+			</File>

+			<File

 				RelativePath="..\..\..\src\LYNews.c">

 			</File>

 			<File

@@ -359,6 +362,9 @@
 				RelativePath="..\..\..\src\mktime.c">

 			</File>

 			<File

+				RelativePath="..\..\..\src\parsdate.c">

+			</File>

+			<File

 				RelativePath="..\..\..\Www\Library\Implementation\SGML.c">

 			</File>

 			<File

diff --git a/BUILD/VS2005X/lynx/lynx.vcproj b/BUILD/VS2005X/lynx/lynx.vcproj
index 0128fa1a..e3a4e0ac 100644
--- a/BUILD/VS2005X/lynx/lynx.vcproj
+++ b/BUILD/VS2005X/lynx/lynx.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\lynx;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\lib&quot;;&quot;$(SolutionDir)..\..\..\WWW\Library\Implementation&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\chrtrans&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_MBCS;HAVE_CONFIG_H;$(NOINHERIT)"

+				PreprocessorDefinitions="WIN32;_CONSOLE;HAVE_CONFIG_H;DONT_HAVE_TM_GMTOFF"

 				GeneratePreprocessedFile="0"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -121,7 +121,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\lynx;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\lib&quot;;&quot;$(SolutionDir)..\..\..\WWW\Library\Implementation&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\chrtrans&quot;"

-				PreprocessorDefinitions="WIN32;_CONSOLE;_MBCS;HAVE_CONFIG_H;$(NOINHERIT)"

+				PreprocessorDefinitions="WIN32;_CONSOLE;_MBCS;HAVE_CONFIG_H;DONT_HAVE_TM_GMTOFF"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

@@ -440,6 +440,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\LYmktime.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\LYNews.c"

 				>

 			</File>

@@ -496,6 +500,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\parsdate.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\WWW\Library\Implementation\SGML.c"

 				>

 			</File>

diff --git a/BUILD/VS2008X/lynx/lynx.vcproj b/BUILD/VS2008X/lynx/lynx.vcproj
index 0128fa1a..e3a4e0ac 100644
--- a/BUILD/VS2008X/lynx/lynx.vcproj
+++ b/BUILD/VS2008X/lynx/lynx.vcproj
@@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				AdditionalIncludeDirectories="..\lynx;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\lib&quot;;&quot;$(SolutionDir)..\..\..\WWW\Library\Implementation&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\chrtrans&quot;"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_MBCS;HAVE_CONFIG_H;$(NOINHERIT)"

+				PreprocessorDefinitions="WIN32;_CONSOLE;HAVE_CONFIG_H;DONT_HAVE_TM_GMTOFF"

 				GeneratePreprocessedFile="0"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -121,7 +121,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalIncludeDirectories="..\lynx;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\lib&quot;;&quot;$(SolutionDir)..\..\..\WWW\Library\Implementation&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\chrtrans&quot;"

-				PreprocessorDefinitions="WIN32;_CONSOLE;_MBCS;HAVE_CONFIG_H;$(NOINHERIT)"

+				PreprocessorDefinitions="WIN32;_CONSOLE;_MBCS;HAVE_CONFIG_H;DONT_HAVE_TM_GMTOFF"

 				RuntimeLibrary="2"

 				UsePrecompiledHeader="0"

 				WarningLevel="3"

@@ -440,6 +440,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\LYmktime.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\src\LYNews.c"

 				>

 			</File>

@@ -496,6 +500,10 @@
 				>

 			</File>

 			<File

+				RelativePath="..\..\..\src\parsdate.c"

+				>

+			</File>

+			<File

 				RelativePath="..\..\..\WWW\Library\Implementation\SGML.c"

 				>

 			</File>

diff --git a/BUILD/VS6/lynx/lynx/lynx.dsp b/BUILD/VS6/lynx/lynx/lynx.dsp
index e0259d36..b7f56f9e 100644
--- a/BUILD/VS6/lynx/lynx/lynx.dsp
+++ b/BUILD/VS6/lynx/lynx/lynx.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\src\chrtrans" /I "..\..\..\..\WWW\Library\Implementation" /I "..\..\..\..\lib" /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "DOSPATH" /D "NO_UNISTD_H" /D "__WIN32__" /D "WIN_EX" /D "NOUSERS" /D "DIRED_SUPPORT" /D "DISP_PARTIAL" /D "HAVE_KEYPAD" /D "NOSIGHUP" /D "NO_TTYTYPE" /D "NO_UTMP" /D "SH_EX" /D "USE_EXTERNALS" /D "USE_FILE_UPLOAD" /D "USE_MULTIBYTE_CURSES" /D "USE_PERSISTENT_COOKIES" /D "USE_PRETTYSRC" /D "USE_READPROGRESS" /D "USE_SCROLLBAR" /D "USE_SOURCE_CACHE" /D "USE_ZLIB" /D "PDCURSES" /D "COLOR_CURSES" /D "FANCY_CURSES" /D "USE_COLOR_STYLE" /D "USE_WINSOCK2_H" /D _WIN32_WINNT=0x0400 /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\..\..\src" /I "..\..\..\..\src\chrtrans" /I "..\..\..\..\WWW\Library\Implementation" /I "..\..\..\..\lib" /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "DOSPATH" /D "NO_UNISTD_H" /D "__WIN32__" /D "WIN_EX" /D "NOUSERS" /D "DIRED_SUPPORT" /D "DISP_PARTIAL" /D "DONT_HAVE_TM_GMTOFF" /D "HAVE_KEYPAD" /D "NOSIGHUP" /D "NO_TTYTYPE" /D "NO_UTMP" /D "SH_EX" /D "USE_EXTERNALS" /D "USE_FILE_UPLOAD" /D "USE_MULTIBYTE_CURSES" /D "USE_PERSISTENT_COOKIES" /D "USE_PRETTYSRC" /D "USE_READPROGRESS" /D "USE_SCROLLBAR" /D "USE_SOURCE_CACHE" /D "USE_ZLIB" /D "PDCURSES" /D "COLOR_CURSES" /D "FANCY_CURSES" /D "USE_COLOR_STYLE" /D "USE_WINSOCK2_H" /D _WIN32_WINNT=0x0400 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\src\chrtrans" /I "..\..\..\..\WWW\Library\Implementation" /I "..\..\..\..\lib" /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "DOSPATH" /D "NO_UNISTD_H" /D "__WIN32__" /D "WIN_EX" /D "NOUSERS" /D "DIRED_SUPPORT" /D "DISP_PARTIAL" /D "HAVE_KEYPAD" /D "NOSIGHUP" /D "NO_TTYTYPE" /D "NO_UTMP" /D "SH_EX" /D "USE_EXTERNALS" /D "USE_FILE_UPLOAD" /D "USE_MULTIBYTE_CURSES" /D "USE_PERSISTENT_COOKIES" /D "USE_PRETTYSRC" /D "USE_READPROGRESS" /D "USE_SCROLLBAR" /D "USE_SOURCE_CACHE" /D "USE_ZLIB" /D "PDCURSES" /D "COLOR_CURSES" /D "FANCY_CURSES" /D "USE_COLOR_STYLE" /D "USE_WINSOCK2_H" /D _WIN32_WINNT=0x0400 /YX /FD /GZ /c

+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\..\..\src" /I "..\..\..\..\src\chrtrans" /I "..\..\..\..\WWW\Library\Implementation" /I "..\..\..\..\lib" /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "DOSPATH" /D "NO_UNISTD_H" /D "__WIN32__" /D "WIN_EX" /D "NOUSERS" /D "DIRED_SUPPORT" /D "DISP_PARTIAL" /D "DONT_HAVE_TM_GMTOFF" /D "HAVE_KEYPAD" /D "NOSIGHUP" /D "NO_TTYTYPE" /D "NO_UTMP" /D "SH_EX" /D "USE_EXTERNALS" /D "USE_FILE_UPLOAD" /D "USE_MULTIBYTE_CURSES" /D "USE_PERSISTENT_COOKIES" /D "USE_PRETTYSRC" /D "USE_READPROGRESS" /D "USE_SCROLLBAR" /D "USE_SOURCE_CACHE" /D "USE_ZLIB" /D "PDCURSES" /D "COLOR_CURSES" /D "FANCY_CURSES" /D "USE_COLOR_STYLE" /D "USE_WINSOCK2_H" /D _WIN32_WINNT=0x0400 /YX /FD /GZ /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -342,6 +342,10 @@ SOURCE=..\..\..\..\src\LYMap.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\..\src\LYmktime.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\..\src\LYNews.c

 # End Source File

 # Begin Source File

@@ -398,6 +402,10 @@ SOURCE=..\..\..\..\src\mktime.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\..\src\parsdate.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\..\WWW\Library\Implementation\SGML.c

 # End Source File

 # Begin Source File

diff --git a/CHANGES b/CHANGES
index e32c8f54..5c2560df 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,42 @@
--- $LynxId: CHANGES,v 1.308 2008/09/21 21:12:42 tom Exp $
+-- $LynxId: CHANGES,v 1.318 2008/12/08 01:31:28 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2008-??-?? (2.8.7dev.11)
+* add fi.po from
+    http://translationproject.org/latest/lynx/
+* update fr.po from
+    http://translationproject.org/latest/lynx/
+* correct handling of the option value from configure "--with-ssl", which was
+  not being used in the search-list (report by PGNet) -TD
+* update configure script macros -TD
+  CF_UTF8_LIB - use CF_FIND_LINKAGE to better work with BSD ports.
+  CF_XOPEN_SOURCE - add case for dragonfly
+* document width-limitation in manpage, fix a few stray 1024's still in the
+  source (report by Barry Haddow) -TD
+* add "read_timeout" to lynx.cfg, and -read_timeout option to command-line
+  (prompted by Dries De Moor report on mailing list) -TD
+* modify to handle a special case where the content-type is given as one of the
+  compressed types, to check if the address (after stripping the file suffix
+  for that compression) has a suffix that lynx could present -TD
+  For example:
+	http://foo/bar.html.gz
+  would display the uncompressed "bar.html" rather than offering to download
+  the file.  This also allows one to add SUFFIX commands to lynx.cfg to display
+  the corresponding plain files.
+  For example:
+	SUFFIX:CHANGES.*:text/plain:8bit
+	SUFFIX:CHANGES:text/plain:8bit
+  for
+	http://foo/CHANGES.tmp.gz
+	http://foo/CHANGES.gz
+* workaround for STRING redefinition in parsdate.c on DJGPP -GV
+* improve configure-check to determine proper fallback when no long-long
+  printing format is available -TD
+* update win32 makefiles/build scripts to add LYmktime, parsdate modules -TD
+* update config.guess (2008-04-14), config.sub (2008-06-16)
+
 2008-09-21 (2.8.7dev.10)
 * remove rw.po, since the translation project no longer supplies it -TD
 * implement "readonly" attribute for TEXTAREA and TEXT fields -TD
diff --git a/PACKAGE/lynx-curses.iss b/PACKAGE/lynx-curses.iss
index 1e17b057..b755150d 100644
--- a/PACKAGE/lynx-curses.iss
+++ b/PACKAGE/lynx-curses.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx-curses.iss,v 1.2 2007/08/02 00:09:46 tom Exp $

+; $LynxId: lynx-curses.iss,v 1.3 2008/09/22 22:08:26 tom Exp $

 ;

 ; This script assumes environment variables have been set, e.g., to point to

 ; data which is used by the installer:

@@ -7,7 +7,7 @@
 ; LYNX_HELPDIR - files and subdirectories installed from Unix with "make install-help"

 

 #define MyAppName "Lynx"

-#define MyAppVerName "Lynx 2.8.7dev.5"

+#define MyAppVerName "Lynx 2.8.7dev.10"

 #define MyAppPublisher "Thomas E Dickey"

 #define MyAppURL "http://lynx.isc.org"

 #define MyAppExeName "lynx.exe"

diff --git a/WWW/FreeofCharge.html b/WWW/FreeofCharge.html
deleted file mode 100644
index 67cb3f20..00000000
--- a/WWW/FreeofCharge.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- X-URL: http://www.w3.org/History/1993/WWW/Conditions/old/FreeofCharge.html -->
-<BASE HREF="http://www.w3.org/History/1993/WWW/Conditions/old/FreeofCharge.html">
-
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-
-<HTML><HEAD><TITLE>
-CERN WWW software freely available</TITLE><NEXTID N="z9"></HEAD><BODY><H1>
-Software freely available</H1>The following CERN software is hereby put into
-the public domain.
-<UL>
-<LI>WWW basic ("line-mode") client <LI>WWW basic server <LI>WWW Library of
-common code.</UL>CERN relinquishes all intellectual property rights to this
-code, both source and binary form and permission is granted for anyone to use,
-duplicate,
-modify and redistribute it.<P>CERN provides absolutely NO WARRANTY OF ANY KIND
-with respect to this software.
-The entire risk as to the quality and performance of this software is with the
-user.
-IN NO EVENT WILL CERN BE LIABLE TO ANYONE FOR ANY DAMAGES ARISING OUT THE USE
-OF THIS SOFTWARE, INCLUDING, WITHOUT LIMITATION,
-DAMAGES RESULTING FROM LOST DATA OR LOST PROFITS, OR FOR ANY SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES.<P>This is part of the <A
-HREF="Introduction.html" NAME="z8">
-CERN WWW</A> distribution condidtions.<P>Declaration to this effect signed by
-the CERN directors of Administration (H. Weber) and Research (W.
-Hoogland), May 1993.</BODY></HTML>
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index bfd79410..2ab38a3c 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.105 2008/09/18 21:34:25 tom Exp $
+ * $LynxId: HTFile.c,v 1.110 2008/12/07 18:49:34 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -1247,6 +1247,62 @@ CompressFileType HTCompressFileType(const char *filename,
 }
 
 /*
+ *  Determine expected file-suffix from the compression method.
+ */
+const char *HTCompressTypeToSuffix(CompressFileType method)
+{
+    const char *result = "";
+
+    switch (method) {
+    default:
+    case cftNone:
+	result = "";
+	break;
+    case cftGzip:
+	result = ".gz";
+	break;
+    case cftCompress:
+	result = ".Z";
+	break;
+    case cftBzip2:
+	result = ".bz2";
+	break;
+    case cftDeflate:
+	result = ".zz";
+	break;
+    }
+    return result;
+}
+
+/*
+ *  Determine compression encoding from the compression method.
+ */
+const char *HTCompressTypeToEncoding(CompressFileType method)
+{
+    const char *result = NULL;
+
+    switch (method) {
+    default:
+    case cftNone:
+	result = NULL;
+	break;
+    case cftGzip:
+	result = "gzip";
+	break;
+    case cftCompress:
+	result = "compress";
+	break;
+    case cftBzip2:
+	result = "bzip2";
+	break;
+    case cftDeflate:
+	result = "deflate";
+	break;
+    }
+    return result;
+}
+
+/*
  * Check if the token from "Content-Encoding" corresponds to a compression
  * type.  RFC 2068 (and cut/paste into RFC 2616) lists these:
  *	gzip
@@ -1276,6 +1332,41 @@ CompressFileType HTEncodingToCompressType(const char *coding)
     return result;
 }
 
+CompressFileType HTContentTypeToCompressType(const char *ct)
+{
+    CompressFileType method = cftNone;
+
+    if (!strncasecomp(ct, "application/gzip", 16) ||
+	!strncasecomp(ct, "application/x-gzip", 18)) {
+	method = cftGzip;
+    } else if (!strncasecomp(ct, "application/compress", 20) ||
+	       !strncasecomp(ct, "application/x-compress", 22)) {
+	method = cftCompress;
+    } else if (!strncasecomp(ct, "application/bzip2", 17) ||
+	       !strncasecomp(ct, "application/x-bzip2", 19)) {
+	method = cftBzip2;
+    }
+    return method;
+}
+
+/*
+ * Check the anchor's content_type and content_encoding elements for a gzip or
+ * Unix compressed file -FM, TD
+ */
+CompressFileType HTContentToCompressType(HTParentAnchor *anchor)
+{
+    CompressFileType method = cftNone;
+    const char *ct = HTAnchor_content_type(anchor);
+    const char *ce = HTAnchor_content_encoding(anchor);
+
+    if (ce == NULL && ct != 0) {
+	method = HTContentTypeToCompressType(ct);
+    } else if (ce != 0) {
+	method = HTEncodingToCompressType(ce);
+    }
+    return method;
+}
+
 /*	Determine write access to a file.
  *	---------------------------------
  *
diff --git a/WWW/Library/Implementation/HTFile.h b/WWW/Library/Implementation/HTFile.h
index 38f407f2..b7a514d6 100644
--- a/WWW/Library/Implementation/HTFile.h
+++ b/WWW/Library/Implementation/HTFile.h
@@ -1,4 +1,6 @@
-/*							File access in libwww
+/*
+ * $LynxId: HTFile.h,v 1.31 2008/12/07 18:49:53 tom Exp $
+ *							File access in libwww
  *				FILE ACCESS
  *
  *  These are routines for local file access used by WWW browsers and servers.
@@ -221,15 +223,25 @@ extern "C" {
 					       int *rootlen);
 
 /*
- *  Determine compression type from the content-type.
+ *  Determine compression type from the content-encoding.
  */
-    extern CompressFileType HTContentToCompressType(const char *encoding);
-
+    extern CompressFileType HTEncodingToCompressType(const char *encoding);
 /*
  *  Determine compression type from the content-encoding.
  */
-    extern CompressFileType HTEncodingToCompressType(const char *encoding);
-
+    extern CompressFileType HTContentTypeToCompressType(const char *ct);
+/*
+ *  Determine compression type from the content-type and/or content-encoding.
+ */
+    extern CompressFileType HTContentToCompressType(HTParentAnchor *anchor);
+/*
+ *  Determine compression encoding from the compression method.
+ */
+    extern const char *HTCompressTypeToEncoding(CompressFileType method);
+/*
+ *  Determine expected file-suffix from the compression method.
+ */
+    extern const char *HTCompressTypeToSuffix(CompressFileType method);
 /*
  *  Determine write access to a file.
  *
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index 5818e8a6..0aaead00 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFormat.c,v 1.63 2008/09/10 23:22:59 tom Exp $
+ * $LynxId: HTFormat.c,v 1.64 2008/12/07 15:53:54 tom Exp $
  *
  *		Manage different file formats			HTFormat.c
  *		=============================
@@ -396,8 +396,9 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
 	    if (pres->rep_out == rep_out) {
 		if (failsMailcap(pres, anchor))
 		    continue;
-		CTRACE((tfp, "FindPresentation: found exact match: %s\n",
-			HTAtom_name(pres->rep)));
+		CTRACE((tfp, "FindPresentation: found exact match: %s -> %s\n",
+			HTAtom_name(pres->rep),
+			HTAtom_name(pres->rep_out)));
 		return pres;
 
 	    } else if (!fill_in) {
@@ -412,8 +413,9 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
 			strong_wildcard_match = pres;
 		    /* otherwise use the first one */
 		    CTRACE((tfp,
-			    "StreamStack: found strong wildcard match: %s\n",
-			    HTAtom_name(pres->rep)));
+			    "StreamStack: found strong wildcard match: %s -> %s\n",
+			    HTAtom_name(pres->rep),
+			    HTAtom_name(pres->rep_out)));
 		}
 	    }
 
@@ -429,8 +431,9 @@ static HTPresentation *HTFindPresentation(HTFormat rep_in,
 		    strong_subtype_wildcard_match = pres;
 		/* otherwise use the first one */
 		CTRACE((tfp,
-			"StreamStack: found strong subtype wildcard match: %s\n",
-			HTAtom_name(pres->rep)));
+			"StreamStack: found strong subtype wildcard match: %s -> %s\n",
+			HTAtom_name(pres->rep),
+			HTAtom_name(pres->rep_out)));
 	    }
 	}
 
@@ -515,8 +518,9 @@ HTStream *HTStreamStack(HTFormat rep_in,
 	if (match == &temp) {
 	    CTRACE((tfp, "StreamStack: Using %s\n", HTAtom_name(temp.rep_out)));
 	} else {
-	    CTRACE((tfp, "StreamStack: found exact match: %s\n",
-		    HTAtom_name(match->rep)));
+	    CTRACE((tfp, "StreamStack: found exact match: %s -> %s\n",
+		    HTAtom_name(match->rep),
+		    HTAtom_name(match->rep_out)));
 	}
 	result = (*match->converter) (match, anchor, sink);
     } else {
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index df5115b6..6f3fb58b 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.64 2008/09/17 00:04:44 tom Exp $
+ * $LynxId: HTMIME.c,v 1.66 2008/12/07 20:23:52 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -215,8 +215,66 @@ static void dequote(char *url)
     }
 }
 
+/*
+ * Strip off any compression-suffix from the address and check if the result
+ * looks like one of the presentable suffixes.  If so, return the corresponding
+ * MIME type.
+ */
+static const char *UncompressedContentType(HTStream *me, CompressFileType method)
+{
+    const char *result = 0;
+    char *address = me->anchor->address;
+    const char *expected = HTCompressTypeToSuffix(method);
+    const char *actual = strrchr(address, '.');
+
+    /*
+     * We have to ensure the suffix is consistent, to use HTFileFormat().
+     */
+    if (actual != 0 && !strcasecomp(actual, expected)) {
+	HTFormat format;
+	HTAtom *pencoding = 0;
+	const char *description = 0;
+
+	format = HTFileFormat(address, &pencoding, &description);
+	result = HTAtom_name(format);
+    }
+
+    return result;
+}
+
 static int pumpData(HTStream *me)
 {
+    CompressFileType method;
+    const char *new_encoding;
+    const char *new_content;
+
+    CTRACE((tfp, "Begin pumpData\n"));
+    /*
+     * If the content-type says it is compressed, and there is no
+     * content-encoding, check further and see if the address (omitting the
+     * suffix for a compressed type) looks like a type we can present.  If so,
+     * rearrange things so we'll present the StreamStack code with the
+     * presentable type, already marked as compressed.
+     */
+    CTRACE((tfp, "...address{%s}\n", me->anchor->address));
+    method = HTContentTypeToCompressType(me->anchor->content_type_params);
+    if ((method != cftNone)
+	&& isEmpty(me->anchor->content_encoding)
+	&& (new_content = UncompressedContentType(me, method)) != 0) {
+
+	new_encoding = HTCompressTypeToEncoding(method);
+	CTRACE((tfp, "reinterpreting as content-type:%s, encoding:%s\n",
+		new_content, new_encoding));
+
+	StrAllocCopy(me->anchor->content_encoding, new_encoding);
+	FREE(me->compression_encoding);
+	StrAllocCopy(me->compression_encoding, new_encoding);
+
+	strcpy(me->value, new_content);
+	StrAllocCopy(me->anchor->content_type_params, me->value);
+	me->format = HTAtom_for(me->value);
+    }
+
     if (strchr(HTAtom_name(me->format), ';') != NULL) {
 	char *cp = NULL, *cp1, *cp2, *cp3 = NULL, *cp4;
 
@@ -451,68 +509,72 @@ static int pumpData(HTStream *me)
 	    }
 	}
     }
+    CTRACE((tfp, "...pumpData finished reading header\n"));
     if (me->head_only) {
 	/* We are done! - kw */
 	me->state = MIME_IGNORE;
-	return HT_OK;
-    }
-
-    if (me->no_streamstack) {
-	me->target = me->sink;
     } else {
-	if (!me->compression_encoding) {
-	    CTRACE((tfp,
-		    "HTMIME: MIME Content-Type is '%s', converting to '%s'\n",
-		    HTAtom_name(me->format), HTAtom_name(me->targetRep)));
+
+	if (me->no_streamstack) {
+	    me->target = me->sink;
 	} else {
+	    if (!me->compression_encoding) {
+		CTRACE((tfp,
+			"HTMIME: MIME Content-Type is '%s', converting to '%s'\n",
+			HTAtom_name(me->format), HTAtom_name(me->targetRep)));
+	    } else {
+		/*
+		 * Change the format to that for "www/compressed" and set up a
+		 * stream to deal with it.  - FM
+		 */
+		CTRACE((tfp, "HTMIME: MIME Content-Type is '%s',\n",
+			HTAtom_name(me->format)));
+		me->format = HTAtom_for("www/compressed");
+		CTRACE((tfp, "        Treating as '%s'.  Converting to '%s'\n",
+			HTAtom_name(me->format), HTAtom_name(me->targetRep)));
+		FREE(me->compression_encoding);
+	    }
+	    me->target = HTStreamStack(me->format, me->targetRep,
+				       me->sink, me->anchor);
+	    if (!me->target) {
+		CTRACE((tfp, "HTMIME: Can't translate! ** \n"));
+		me->target = me->sink;	/* Cheat */
+	    }
+	}
+	if (me->target) {
+	    me->targetClass = *me->target->isa;
 	    /*
-	     * Change the format to that for "www/compressed" and set up a
-	     * stream to deal with it.  - FM
+	     * Pump rest of data right through, according to the transfer encoding.
 	     */
-	    CTRACE((tfp, "HTMIME: MIME Content-Type is '%s',\n", HTAtom_name(me->format)));
-	    me->format = HTAtom_for("www/compressed");
-	    CTRACE((tfp, "        Treating as '%s'.  Converting to '%s'\n",
-		    HTAtom_name(me->format), HTAtom_name(me->targetRep)));
-	    FREE(me->compression_encoding);
-	}
-	me->target = HTStreamStack(me->format, me->targetRep,
-				   me->sink, me->anchor);
-	if (!me->target) {
-	    CTRACE((tfp, "HTMIME: Can't translate! ** \n"));
-	    me->target = me->sink;	/* Cheat */
+	    me->state = (me->chunked_encoding
+			 ? MIME_CHUNKED
+			 : MIME_TRANSPARENT);
+	} else {
+	    me->state = MIME_IGNORE;	/* What else to do? */
 	}
-    }
-    if (me->target) {
-	me->targetClass = *me->target->isa;
-	/*
-	 * Pump rest of data right through, according to the transfer encoding.
-	 */
-	me->state = (me->chunked_encoding
-		     ? MIME_CHUNKED
-		     : MIME_TRANSPARENT);
-    } else {
-	me->state = MIME_IGNORE;	/* What else to do? */
-    }
-    if (me->refresh_url != NULL && !content_is_compressed(me)) {
-	char *url = NULL;
-	char *num = NULL;
-	char *txt = NULL;
-	const char *base = "";	/* FIXME: refresh_url may be relative to doc */
-
-	LYParseRefreshURL(me->refresh_url, &num, &url);
-	if (url != NULL && me->format == WWW_HTML) {
-	    CTRACE((tfp, "Formatting refresh-url as first line of result\n"));
-	    HTSprintf0(&txt, gettext("Refresh: "));
-	    HTSprintf(&txt, gettext("%s seconds "), num);
-	    dequote(url);
-	    HTSprintf(&txt, "<a href=\"%s%s\">%s</a><br>", base, url, url);
-	    CTRACE((tfp, "URL %s%s\n", base, url));
-	    (me->isa->put_string) (me, txt);
-	    free(txt);
+	if (me->refresh_url != NULL && !content_is_compressed(me)) {
+	    char *url = NULL;
+	    char *num = NULL;
+	    char *txt = NULL;
+	    const char *base = "";	/* FIXME: refresh_url may be relative to doc */
+
+	    LYParseRefreshURL(me->refresh_url, &num, &url);
+	    if (url != NULL && me->format == WWW_HTML) {
+		CTRACE((tfp,
+			"Formatting refresh-url as first line of result\n"));
+		HTSprintf0(&txt, gettext("Refresh: "));
+		HTSprintf(&txt, gettext("%s seconds "), num);
+		dequote(url);
+		HTSprintf(&txt, "<a href=\"%s%s\">%s</a><br>", base, url, url);
+		CTRACE((tfp, "URL %s%s\n", base, url));
+		(me->isa->put_string) (me, txt);
+		free(txt);
+	    }
+	    FREE(num);
+	    FREE(url);
 	}
-	FREE(num);
-	FREE(url);
     }
+    CTRACE((tfp, "...end of pumpData\n"));
     return HT_OK;
 }
 
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index ee7c52b5..033815f1 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.97 2008/09/20 14:32:29 tom Exp $
+ * $LynxId: HTTCP.c,v 1.98 2008/12/07 21:10:36 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -1548,6 +1548,17 @@ static BOOL HTWasInterrupted(int *status)
     return result;
 }
 
+#define TRIES_PER_SECOND 10
+
+/*
+ * Set the select-timeout to 0.1 seconds.
+ */
+static void set_timeout(struct timeval *timeoutp)
+{
+    timeoutp->tv_sec = 0;
+    timeoutp->tv_usec = 100000;
+}
+
 #ifndef MULTINET		/* SOCKET_ERRNO != errno ? */
 #if !defined(UCX) || !defined(VAXC)	/* errno not modifiable ? */
 #define SOCKET_DEBUG_TRACE	/* show errno status after some system calls */
@@ -1748,7 +1759,7 @@ int HTDoConnect(const char *url,
 		/*
 		 * Protect against an infinite loop.
 		 */
-		if ((tries++ / 10) >= connect_timeout) {
+		if ((tries++ / TRIES_PER_SECOND) >= connect_timeout) {
 		    HTAlert(gettext("Connection failed (too many retries)."));
 #ifdef INET6
 		    FREE(line);
@@ -1757,13 +1768,7 @@ int HTDoConnect(const char *url,
 #endif /* INET6 */
 		    return HT_NO_DATA;
 		}
-#ifdef _WINDOWS_NSL
-		select_timeout.tv_sec = connect_timeout;
-		select_timeout.tv_usec = 0;
-#else
-		select_timeout.tv_sec = 0;
-		select_timeout.tv_usec = 100000;
-#endif /* _WINDOWS_NSL */
+		set_timeout(&select_timeout);
 		FD_ZERO(&writefds);
 		FD_SET((unsigned) *s, &writefds);
 #ifdef SOCKS
@@ -2007,14 +2012,14 @@ int HTDoRead(int fildes,
 	/*
 	 * Protect against an infinite loop.
 	 */
-	if (tries++ >= 180000) {
-	    HTAlert(gettext("Socket read failed for 180,000 tries."));
+	if ((tries++ / TRIES_PER_SECOND) >= reading_timeout) {
+	    HTAlert(gettext("Socket read failed (too many tries)."));
 	    SET_EINTR;
 	    result = HT_INTERRUPTED;
 	    break;
 	}
 #ifdef USE_READPROGRESS
-	if (tries - otries > 10) {
+	if (tries - otries > TRIES_PER_SECOND) {
 	    time_t t = time((time_t *) 0);
 
 	    otries = tries;
@@ -2030,8 +2035,7 @@ int HTDoRead(int fildes,
 	 * Allow for this possibility.  - JED
 	 */
 	do {
-	    select_timeout.tv_sec = 0;
-	    select_timeout.tv_usec = 100000;
+	    set_timeout(&select_timeout);
 	    FD_ZERO(&readfds);
 	    FD_SET((unsigned) fildes, &readfds);
 #ifdef SOCKS
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index cdc3442d..0bc6a66d 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.87 2008/09/17 16:31:34 tom Exp $
+ * $LynxId: HTUtils.h,v 1.89 2008/09/24 00:20:35 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -550,15 +550,19 @@ extern int WWW_TraceMask;
 #define PRI_off_t	PRId64
 #define SCN_off_t	SCNd64
 #define CAST_off_t(n)	(int64_t)(n)
-#elif defined(PRId32)
+#elif (SIZEOF_OFF_T == 4) && defined(PRId32)
 #define PRI_off_t	PRId32
 #define SCN_off_t	SCNd32
+#if (SIZEOF_LONG == 4)
+#define CAST_off_t(n)	(long)(n)
+#else
 #define CAST_off_t(n)	(int32_t)(n)
 #endif
 #endif
+#endif
 
 #ifndef PRI_off_t
-#if (SIZEOF_OFF_T == 8)
+#if (SIZEOF_OFF_T > SIZEOF_LONG)
 #define PRI_off_t	"lld"
 #define SCN_off_t	"lld"
 #define CAST_off_t(n)	(long long)(n)
@@ -577,15 +581,19 @@ extern int WWW_TraceMask;
 #define PRI_time_t	PRId64
 #define SCN_time_t	SCNd64
 #define CAST_time_t(n)	(int64_t)(n)
-#elif defined(PRId32)
+#elif (SIZEOF_TIME_T == 4) && defined(PRId32)
 #define PRI_time_t	PRId32
 #define SCN_time_t	SCNd32
+#if (SIZEOF_LONG == 4)
+#define CAST_time_t(n)	(long)(n)
+#else
 #define CAST_time_t(n)	(int32_t)(n)
 #endif
 #endif
+#endif
 
 #ifndef PRI_time_t
-#if (SIZEOF_TIME_T == 8)
+#if (SIZEOF_TIME_T > SIZEOF_LONG)
 #define PRI_time_t	"lld"
 #define SCN_time_t	"lld"
 #define CAST_time_t(n)	(long long)(n)
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index fe8f9ecd..73e762c3 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.c,v 1.117 2008/09/21 18:34:39 tom Exp $
+ * $LynxId: SGML.c,v 1.118 2008/09/22 23:21:46 tom Exp $
  *
  *			General SGML Parser code		SGML.c
  *			========================
@@ -1564,7 +1564,7 @@ static void discard_empty(HTStream *context)
 }
 
 #ifdef USE_PRETTYSRC
-static BOOL end_if_prettysrc(HTStream *context, HTChunk *string, int end_ch)
+static BOOL end_if_prettysrc(HTStream *context, HTChunk *string, char end_ch)
 {
     BOOL result = psrc_view;
 
diff --git a/aclocal.m4 b/aclocal.m4
index 8a0c3e85..d091ae81 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.126 2008/06/30 23:59:52 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.127 2008/12/08 00:40:44 tom Exp $
 dnl Macros for auto-configure script.
 dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -1268,13 +1268,14 @@ AC_TRY_LINK([#include <stdio.h>],[printf("Hello world");],,
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_ERRNO version: 9 updated: 2001/12/30 18:03:23
+dnl CF_CHECK_ERRNO version: 10 updated: 2008/08/22 16:33:22
 dnl --------------
 dnl Check for data that is usually declared in <stdio.h> or <errno.h>, e.g.,
 dnl the 'errno' variable.  Define a DECL_xxx symbol if we must declare it
 dnl ourselves.
 dnl
 dnl $1 = the name to check
+dnl $2 = the assumed type
 AC_DEFUN([CF_CHECK_ERRNO],
 [
 AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
@@ -1285,7 +1286,7 @@ AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[
 #include <stdio.h>
 #include <sys/types.h>
 #include <errno.h> ],
-    [long x = (long) $1],
+    ifelse($2,,int,$2) x = (ifelse($2,,int,$2)) $1,
     [cf_cv_dcl_$1=yes],
     [cf_cv_dcl_$1=no])
 ])
@@ -1296,7 +1297,7 @@ if test "$cf_cv_dcl_$1" = no ; then
 fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
-CF_CHECK_EXTERN_DATA($1,int)
+CF_CHECK_EXTERN_DATA($1,ifelse($2,,int,$2))
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_CHECK_EXTERN_DATA version: 3 updated: 2001/12/30 18:03:23
@@ -1600,7 +1601,7 @@ fi
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 27 updated: 2008/03/23 14:48:54
+dnl CF_CURSES_LIBS version: 28 updated: 2008/10/30 20:16:05
 dnl --------------
 dnl Look for the curses libraries.  Older curses implementations may require
 dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
@@ -1666,7 +1667,7 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
     # Check for library containing initscr
     test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
-    for cf_curs_lib in $cf_check_list xcurses jcurses unknown
+ 	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
     do
         AC_CHECK_LIB($cf_curs_lib,initscr,[break])
     done
@@ -2531,7 +2532,7 @@ if test "$GCC" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 22 updated: 2007/07/29 09:55:12
+dnl CF_GCC_WARNINGS version: 23 updated: 2008/07/26 17:54:02
 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:
@@ -2626,7 +2627,7 @@ then
 				;;
 			Winline) #(vi
 				case $GCC_VERSION in
-				3.3*)
+				[[34]].*)
 					CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
 					continue;;
 				esac
@@ -2720,11 +2721,31 @@ make an error
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_HEADER_PATH version: 8 updated: 2002/11/10 14:46:59
+dnl CF_HEADER_PATH version: 9 updated: 2008/12/07 19:38:31
 dnl --------------
-dnl Construct a search-list for a nonstandard header-file
+dnl Construct a search-list of directories for a nonstandard header-file
+dnl
+dnl Parameters
+dnl	$1 = the variable to return as result
+dnl	$2 = the package name
 AC_DEFUN([CF_HEADER_PATH],
-[CF_SUBDIR_PATH($1,$2,include)
+[
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+			CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE)
+			cf_header_path_list="$cf_header_path_list [$]$1"
+			;;
+		esac
+	done
+fi
+
+CF_SUBDIR_PATH($1,$2,include)
+
 test "$includedir" != NONE && \
 test "$includedir" != "/usr/include" && \
 test -d "$includedir" && {
@@ -2739,6 +2760,7 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/$2 && $1="[$]$1 $oldincludedir/$2"
 }
 
+$1="$cf_header_path_list [$]$1"
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
@@ -2905,11 +2927,33 @@ AC_TRY_COMPILE([
 test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LIBRARY_PATH version: 7 updated: 2002/11/10 14:46:59
+dnl CF_LIBRARY_PATH version: 8 updated: 2008/12/07 19:38:31
 dnl ---------------
-dnl Construct a search-list for a nonstandard library-file
+dnl Construct a search-list of directories for a nonstandard library-file
+dnl
+dnl Parameters
+dnl	$1 = the variable to return as result
+dnl	$2 = the package name
 AC_DEFUN([CF_LIBRARY_PATH],
-[CF_SUBDIR_PATH($1,$2,lib)])dnl
+[
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+			CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE)
+			cf_library_path_list="$cf_library_path_list [$]$1"
+			;;
+		esac
+	done
+fi
+
+CF_SUBDIR_PATH($1,$2,lib)
+
+$1="$cf_library_path_list [$]$1"
+])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_LOCALE version: 4 updated: 2003/02/16 08:16:04
 dnl ---------
@@ -4783,7 +4827,7 @@ AC_DEFUN([CF_UPPER],
 $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_UTF8_LIB version: 4 updated: 2003/03/01 18:36:42
+dnl CF_UTF8_LIB version: 5 updated: 2008/10/17 19:37:52
 dnl -----------
 dnl Check for multibyte support, and if not found, utf8 compatibility library
 AC_DEFUN([CF_UTF8_LIB],
@@ -4793,18 +4837,18 @@ AC_CACHE_CHECK(for multibyte character support,cf_cv_utf8_lib,[
 	AC_TRY_LINK([
 #include <stdlib.h>],[putwc(0,0);],
 	[cf_cv_utf8_lib=yes],
-	[LIBS="-lutf8 $LIBS"
-	 AC_TRY_LINK([
-#include <libutf8.h>],[putwc(0,0);],
+	[CF_FIND_LINKAGE([
+#include <libutf8.h>],[putwc(0,0);],utf8,
 		[cf_cv_utf8_lib=add-on],
 		[cf_cv_utf8_lib=no])
-	LIBS="$cf_save_LIBS"
 ])])
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
 # ncurses/ncursesw:
 if test "$cf_cv_utf8_lib" = "add-on" ; then
 	AC_DEFINE(HAVE_LIBUTF8_H)
+	CF_ADD_INCDIR($cf_cv_header_path_utf8)
+	CF_ADD_LIBDIR($cf_cv_library_path_utf8)
 	LIBS="-lutf8 $LIBS"
 fi
 ])dnl
@@ -5255,7 +5299,7 @@ AC_TRY_LINK([
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38
+dnl CF_XOPEN_SOURCE version: 26 updated: 2008/07/27 11:26:57
 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,
@@ -5275,7 +5319,7 @@ case $host_os in #(vi
 aix[[45]]*) #(vi
 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
 	;;
-freebsd*) #(vi
+freebsd*|dragonfly*) #(vi
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
 	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
diff --git a/config.guess b/config.guess
index 6ac1d64a..c7607c74 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-03-12'
+timestamp='2008-04-14'
 
 # 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
@@ -180,7 +180,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-		os=netbsd
+	        os=netbsd
 		;;
 	esac
 	# The OS release
@@ -219,11 +219,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
-	    *4.0)
+	*4.0)
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
-	    *5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -295,7 +295,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-	echo powerpc-ibm-os400
+        echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -375,23 +375,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -461,8 +461,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -575,8 +575,8 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
                       532)                      # CPU_PA_RISC2_0
@@ -711,22 +711,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-	exit ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-	exit ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-	exit ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-	exit ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -750,14 +750,14 @@ EOF
 	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 ;;
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -785,14 +785,14 @@ EOF
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:[3456]*)
-	case ${UNAME_MACHINE} in
+    	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -800,8 +800,8 @@ EOF
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
-	    	echo ia64-unknown-interix${UNAME_RELEASE}
-	    	exit ;;
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -837,7 +837,8 @@ EOF
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | grep -q __ARM_EABI__
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
@@ -854,7 +855,7 @@ EOF
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+    	echo frv-unknown-linux-gnu
 	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -882,10 +883,10 @@ EOF
 	#endif
 EOF
 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-		/^CPU/{
-			s: ::g
-			p
-		}'`"
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -905,15 +906,15 @@ EOF
 	#endif
 EOF
 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-		/^CPU/{
-			s: ::g
-			p
-		}'`"
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-    	echo or32-unknown-linux-gnu
-    	exit ;;
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
@@ -929,7 +930,7 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
+        esac
 	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}
@@ -949,7 +950,7 @@ EOF
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -964,7 +965,7 @@ EOF
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -977,16 +978,13 @@ EOF
 				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
-	case "$ld_supported_targets" in
+        case "$ld_supported_targets" in
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
@@ -1019,10 +1017,10 @@ EOF
 	#endif
 EOF
 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-		/^LIBC/{
-			s: ::g
-			p
-		}'`"
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1036,11 +1034,11 @@ EOF
 	echo i386-sequent-sysv4
 	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...
-	# I am not positive that other SVR4 systems won't match this,
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
+        # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1072,7 +1070,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1100,10 +1098,10 @@ EOF
 	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.
+        # 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 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1138,8 +1136,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { 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; } ;;
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1173,9 +1171,9 @@ EOF
 	fi
 	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-	              # says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1205,7 +1203,7 @@ EOF
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-	exit ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1252,8 +1250,8 @@ EOF
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
-	    UNAME_PROCESSOR=i386
-	    UNAME_MACHINE=pc
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 	exit ;;
@@ -1305,13 +1303,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
+        echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1486,9 +1484,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
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 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.hin b/config.hin
index b9644bfa..32f203e8 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.104 2008/07/05 14:53:30 tom Exp $
+ * $LynxId: config.hin,v 1.105 2008/09/23 22:40:50 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -216,6 +216,7 @@
 #undef RLOGIN_PATH		/* CF_PATH_PROG(rlogin) */
 #undef RM_PATH			/* CF_PATH_PROG(rm) */
 #undef SETFONT_PATH		/* CF_PATH_PROG(setfont) */
+#undef SIZEOF_LONG		/* AC_CHECK_SIZEOF(long) */
 #undef SIZEOF_OFF_T		/* AC_CHECK_SIZEOF(off_t) */
 #undef SIZEOF_TIME_T		/* AC_CHECK_SIZEOF(time_t) */
 #undef SOCKS			/* CF_SOCKS, CF_SOCKS5 */
diff --git a/config.sub b/config.sub
index d89676eb..a649350a 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-03-08'
+timestamp='2008-06-16'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -250,7 +250,7 @@ case $basic_machine in
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -306,8 +306,8 @@ case $basic_machine in
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
-		basic_machine=$basic_machine-pc
-		;;
+	  basic_machine=$basic_machine-pc
+	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -331,9 +331,9 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32c- | m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -397,7 +397,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	abacus)
+    	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -463,6 +463,10 @@ case $basic_machine in
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -530,6 +534,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -1217,8 +1225,8 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1252,7 +1260,7 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1301,7 +1309,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-	-os400*)
+        -os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1350,7 +1358,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-	-tpf*)
+        -tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1392,6 +1400,9 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
@@ -1414,10 +1425,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-	score-*)
+        score-*)
 		os=-elf
 		;;
-	spu-*)
+        spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1429,8 +1440,8 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
+        c4x-* | tic4x-*)
+        	os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1457,7 +1468,7 @@ case $basic_machine in
 	m68*-cisco)
 		os=-aout
 		;;
-	mep-*)
+        mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1484,7 +1495,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-	*-knuth)
+    	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff --git a/configure b/configure
index c96f89e1..da345e92 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.7dev.9.
+# From configure.in 2.8.7dev.10.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20080325.
 #
@@ -3117,7 +3117,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				;;
 			Winline) #(vi
 				case $GCC_VERSION in
-				3.3*)
+				[34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
 echo "${as_me-configure}:3123: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
@@ -6232,7 +6232,32 @@ echo "${as_me-configure}:6230: testing Searching for headers in FIND_LINKAGE(ico
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
-    cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/iconv &&       cf_search="$cf_search $cf_header_path/include/iconv"
+	test -d $cf_header_path/include/iconv/include &&    cf_search="$cf_search $cf_header_path/include/iconv/include"
+	test -d $cf_header_path/iconv/include &&       cf_search="$cf_search $cf_header_path/iconv/include"
+	test -d $cf_header_path/iconv/include/iconv &&    cf_search="$cf_search $cf_header_path/iconv/include/iconv"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -6303,16 +6328,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/iconv && cf_search="$cf_search $oldincludedir/iconv"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
     for cf_cv_header_path_iconv in $cf_search
     do
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:6311: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:6338: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
-#line 6315 "configure"
+#line 6342 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6331,21 +6358,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6337: \$? = $ac_status" >&5
+  echo "$as_me:6364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6343: \$? = $ac_status" >&5
+  echo "$as_me:6370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:6348: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:6375: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6363,13 +6390,39 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:6366: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:6393: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
 
       if test "$cf_cv_find_linkage_iconv" != yes ; then
-        cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/iconv &&       cf_search="$cf_search $cf_library_path/lib/iconv"
+	test -d $cf_library_path/lib/iconv/lib &&    cf_search="$cf_search $cf_library_path/lib/iconv/lib"
+	test -d $cf_library_path/iconv/lib &&       cf_search="$cf_search $cf_library_path/iconv/lib"
+	test -d $cf_library_path/iconv/lib/iconv &&    cf_search="$cf_search $cf_library_path/iconv/lib/iconv"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -6426,18 +6479,20 @@ test -d "$HOME" && \
 	test -d $HOME/iconv/lib/iconv &&    cf_search="$cf_search $HOME/iconv/lib/iconv"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
         for cf_cv_library_path_iconv in $cf_search
         do
           if test -d $cf_cv_library_path_iconv ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:6434: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:6489: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-liconv  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
             cat >conftest.$ac_ext <<_ACEOF
-#line 6440 "configure"
+#line 6495 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6456,21 +6511,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6514: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6462: \$? = $ac_status" >&5
+  echo "$as_me:6517: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6468: \$? = $ac_status" >&5
+  echo "$as_me:6523: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:6473: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:6528: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -6506,7 +6561,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:6509: result: $am_cv_func_iconv" >&5
+echo "$as_me:6564: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -6515,14 +6570,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:6518: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:6573: checking if the declaration of iconv() needs const." >&5
 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
 if test "${am_cv_proto_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 6525 "configure"
+#line 6580 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6547,16 +6602,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6550: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6605: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6553: \$? = $ac_status" >&5
+  echo "$as_me:6608: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6559: \$? = $ac_status" >&5
+  echo "$as_me:6614: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -6566,7 +6621,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6569: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:6624: result: $am_cv_proto_iconv_const" >&5
 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
 
     if test "$am_cv_proto_iconv_const" = yes ; then
@@ -6608,7 +6663,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6611 "configure"
+#line 6666 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6620,16 +6675,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6626: \$? = $ac_status" >&5
+  echo "$as_me:6681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6632: \$? = $ac_status" >&5
+  echo "$as_me:6687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6646,7 +6701,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:6649: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:6704: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -6683,7 +6738,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:6686: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:6741: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6694,13 +6749,13 @@ fi
     fi
   fi
 
-  echo "$as_me:6697: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:6752: 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 6703 "configure"
+#line 6758 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -6712,16 +6767,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6718: \$? = $ac_status" >&5
+  echo "$as_me:6773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6724: \$? = $ac_status" >&5
+  echo "$as_me:6779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6732,7 +6787,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6735: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6790: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -6743,13 +6798,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:6746: checking for LC_MESSAGES" >&5
+    echo "$as_me:6801: 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 6752 "configure"
+#line 6807 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -6761,16 +6816,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6819: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6767: \$? = $ac_status" >&5
+  echo "$as_me:6822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6773: \$? = $ac_status" >&5
+  echo "$as_me:6828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -6780,7 +6835,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6783: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:6838: 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
 
@@ -6790,7 +6845,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:6793: checking whether NLS is requested" >&5
+   echo "$as_me:6848: 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.
@@ -6800,7 +6855,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:6803: result: $USE_NLS" >&5
+  echo "$as_me:6858: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -6813,7 +6868,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:6816: checking whether included gettext is requested" >&5
+    echo "$as_me:6871: 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.
@@ -6823,14 +6878,14 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:6826: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:6881: 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:6833: checking for libintl.h and gettext()" >&5
+      echo "$as_me:6888: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
 if test "${cf_cv_func_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6841,10 +6896,10 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me-configure}:6844: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:6899: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6847 "configure"
+#line 6902 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6864,16 +6919,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6870: \$? = $ac_status" >&5
+  echo "$as_me:6925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6876: \$? = $ac_status" >&5
+  echo "$as_me:6931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_intl=yes
 else
@@ -6882,12 +6937,37 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_intl=no
 
-echo "${as_me-configure}:6885: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:6940: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
-    cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/intl &&       cf_search="$cf_search $cf_header_path/include/intl"
+	test -d $cf_header_path/include/intl/include &&    cf_search="$cf_search $cf_header_path/include/intl/include"
+	test -d $cf_header_path/intl/include &&       cf_search="$cf_search $cf_header_path/intl/include"
+	test -d $cf_header_path/intl/include/intl &&    cf_search="$cf_search $cf_header_path/intl/include/intl"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -6958,16 +7038,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/intl && cf_search="$cf_search $oldincludedir/intl"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
     for cf_cv_header_path_intl in $cf_search
     do
       if test -d $cf_cv_header_path_intl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:6966: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me-configure}:7048: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 6970 "configure"
+#line 7052 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -6987,21 +7069,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7072: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6993: \$? = $ac_status" >&5
+  echo "$as_me:7075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6999: \$? = $ac_status" >&5
+  echo "$as_me:7081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:7004: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me-configure}:7086: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
             cf_cv_find_linkage_intl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7019,13 +7101,39 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me-configure}:7022: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:7104: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
 
       if test "$cf_cv_find_linkage_intl" != yes ; then
-        cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/intl &&       cf_search="$cf_search $cf_library_path/lib/intl"
+	test -d $cf_library_path/lib/intl/lib &&    cf_search="$cf_search $cf_library_path/lib/intl/lib"
+	test -d $cf_library_path/intl/lib &&       cf_search="$cf_search $cf_library_path/intl/lib"
+	test -d $cf_library_path/intl/lib/intl &&    cf_search="$cf_search $cf_library_path/intl/lib/intl"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -7082,18 +7190,20 @@ test -d "$HOME" && \
 	test -d $HOME/intl/lib/intl &&    cf_search="$cf_search $HOME/intl/lib/intl"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
         for cf_cv_library_path_intl in $cf_search
         do
           if test -d $cf_cv_library_path_intl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:7090: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me-configure}:7200: testing ... testing $cf_cv_library_path_intl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lintl  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 7096 "configure"
+#line 7206 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7113,21 +7223,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7226: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7119: \$? = $ac_status" >&5
+  echo "$as_me:7229: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7125: \$? = $ac_status" >&5
+  echo "$as_me:7235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:7130: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me-configure}:7240: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
                 cf_cv_find_linkage_intl=yes
                 cf_cv_library_file_intl="-lintl"
@@ -7163,7 +7273,7 @@ cf_cv_func_gettext=no
 fi
 
 fi
-echo "$as_me:7166: result: $cf_cv_func_gettext" >&5
+echo "$as_me:7276: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
 
       if test "$cf_cv_func_gettext" = yes ; then
@@ -7201,7 +7311,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 7204 "configure"
+#line 7314 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7213,16 +7323,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7326: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7219: \$? = $ac_status" >&5
+  echo "$as_me:7329: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7225: \$? = $ac_status" >&5
+  echo "$as_me:7335: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7239,7 +7349,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:7242: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:7352: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -7276,7 +7386,7 @@ if test -n "$cf_cv_library_path_intl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:7279: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:7389: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         INTLLIBS="-L$cf_add_libdir $$INTLLIBS"
       fi
@@ -7292,13 +7402,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7295: checking for $ac_func" >&5
+echo "$as_me:7405: 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 7301 "configure"
+#line 7411 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7329,16 +7439,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7335: \$? = $ac_status" >&5
+  echo "$as_me:7445: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7341: \$? = $ac_status" >&5
+  echo "$as_me:7451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7348,7 +7458,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7351: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7461: 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
@@ -7363,7 +7473,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:7366: checking for $ac_word" >&5
+echo "$as_me:7476: 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
@@ -7391,16 +7501,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7394: result: $MSGFMT" >&5
+  echo "$as_me:7504: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7397: result: no" >&5
+  echo "$as_me:7507: 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:7403: checking for $ac_word" >&5
+echo "$as_me:7513: 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
@@ -7417,7 +7527,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:7420: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7530: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7429,17 +7539,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:7432: result: $GMSGFMT" >&5
+  echo "$as_me:7542: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:7435: result: no" >&5
+  echo "$as_me:7545: 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:7442: checking for $ac_word" >&5
+echo "$as_me:7552: 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
@@ -7467,10 +7577,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:7470: result: $XGETTEXT" >&5
+  echo "$as_me:7580: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:7473: result: no" >&5
+  echo "$as_me:7583: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7485,7 +7595,7 @@ fi
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:7488: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:7598: 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
@@ -7493,7 +7603,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:7496: checking for $ac_word" >&5
+echo "$as_me:7606: 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
@@ -7521,16 +7631,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7524: result: $MSGFMT" >&5
+  echo "$as_me:7634: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7527: result: no" >&5
+  echo "$as_me:7637: 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:7533: checking for $ac_word" >&5
+echo "$as_me:7643: 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
@@ -7547,7 +7657,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:7550: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7660: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7559,17 +7669,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:7562: result: $GMSGFMT" >&5
+  echo "$as_me:7672: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:7565: result: no" >&5
+  echo "$as_me:7675: 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:7572: checking for $ac_word" >&5
+echo "$as_me:7682: 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
@@ -7597,10 +7707,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:7600: result: $XGETTEXT" >&5
+  echo "$as_me:7710: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:7603: result: no" >&5
+  echo "$as_me:7713: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7615,7 +7725,7 @@ fi
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:7618: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:7728: 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
@@ -7625,7 +7735,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:7628: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:7738: 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
@@ -7645,7 +7755,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:7648: checking for $ac_word" >&5
+echo "$as_me:7758: 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
@@ -7660,7 +7770,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:7663: found $ac_dir/$ac_word" >&5
+echo "$as_me:7773: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7668,10 +7778,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:7671: result: $INTLBISON" >&5
+  echo "$as_me:7781: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:7674: result: no" >&5
+  echo "$as_me:7784: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7681,7 +7791,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:7684: checking version of bison" >&5
+            echo "$as_me:7794: 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
@@ -7690,7 +7800,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:7693: result: $ac_prog_version" >&5
+    echo "$as_me:7803: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -7716,7 +7826,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:7719: checking for catalogs to be installed" >&5
+       echo "$as_me:7829: 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
@@ -7736,7 +7846,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:7739: result: $LINGUAS" >&5
+       echo "$as_me:7849: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -7769,7 +7879,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:7772: checking if we should use included message-library" >&5
+echo "$as_me:7882: 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.
@@ -7780,7 +7890,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:7783: result: $use_our_messages" >&5
+echo "$as_me:7893: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -7821,23 +7931,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:7824: checking for $ac_header" >&5
+echo "$as_me:7934: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7830 "configure"
+#line 7940 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:7834: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7944: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7840: \$? = $ac_status" >&5
+  echo "$as_me:7950: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7856,7 +7966,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:7859: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:7969: 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
@@ -7939,7 +8049,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:7942: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:8052: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -7948,7 +8058,7 @@ esac
 fi
 NLS_DATADIR="$withval"
 
-echo "$as_me:7951: checking if you want full utility pathnames" >&5
+echo "$as_me:8061: 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.
@@ -7965,13 +8075,13 @@ else
   with_full_paths=yes
 
 fi;
-echo "$as_me:7968: result: $with_full_paths" >&5
+echo "$as_me:8078: 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:7974: checking for system mailer" >&5
+echo "$as_me:8084: 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
@@ -7991,13 +8101,13 @@ else
 
 fi
 
-echo "$as_me:7994: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:8104: 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:8000: checking system mail flags" >&5
+echo "$as_me:8110: 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
@@ -8013,7 +8123,7 @@ else
 
 fi
 
-echo "$as_me:8016: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:8126: 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"
@@ -8025,7 +8135,7 @@ if test $with_full_paths = no ; then
 fi
 fi
 
-echo "$as_me:8028: checking if $CC -U and -D options work together" >&5
+echo "$as_me:8138: 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
@@ -8034,7 +8144,7 @@ else
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8037 "configure"
+#line 8147 "configure"
 #include "confdefs.h"
 
 int
@@ -8053,16 +8163,16 @@ make a defined-error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8166: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8059: \$? = $ac_status" >&5
+  echo "$as_me:8169: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8065: \$? = $ac_status" >&5
+  echo "$as_me:8175: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_cc_u_d_options=yes
@@ -8076,7 +8186,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:8079: result: $cf_cv_cc_u_d_options" >&5
+echo "$as_me:8189: result: $cf_cv_cc_u_d_options" >&5
 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
 
 cf_XOPEN_SOURCE=600
@@ -8086,7 +8196,7 @@ case $host_os in #(vi
 aix[45]*) #(vi
 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
 	;;
-freebsd*) #(vi
+freebsd*|dragonfly*) #(vi
 	# 5.x headers associate
 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
 	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
@@ -8102,14 +8212,14 @@ irix[56].*) #(vi
 	;;
 linux*|gnu*|k*bsd*-gnu) #(vi
 
-echo "$as_me:8105: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:8215: 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 8112 "configure"
+#line 8222 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8124,16 +8234,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8237: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8130: \$? = $ac_status" >&5
+  echo "$as_me:8240: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8136: \$? = $ac_status" >&5
+  echo "$as_me:8246: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -8142,7 +8252,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8145 "configure"
+#line 8255 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8157,16 +8267,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8160: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8163: \$? = $ac_status" >&5
+  echo "$as_me:8273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8169: \$? = $ac_status" >&5
+  echo "$as_me:8279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -8181,7 +8291,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8184: result: $cf_cv_gnu_source" >&5
+echo "$as_me:8294: 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"
 
@@ -8208,14 +8318,14 @@ solaris*) #(vi
 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:8211: checking if we should define _XOPEN_SOURCE" >&5
+	echo "$as_me:8321: 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 8218 "configure"
+#line 8328 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8230,16 +8340,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8343: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8236: \$? = $ac_status" >&5
+  echo "$as_me:8346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8242: \$? = $ac_status" >&5
+  echo "$as_me:8352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8248,7 +8358,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8251 "configure"
+#line 8361 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8263,16 +8373,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8376: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8269: \$? = $ac_status" >&5
+  echo "$as_me:8379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8275: \$? = $ac_status" >&5
+  echo "$as_me:8385: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8287,7 +8397,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8290: result: $cf_cv_xopen_source" >&5
+echo "$as_me:8400: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 	if test "$cf_cv_xopen_source" != no ; then
 
@@ -8321,16 +8431,16 @@ 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:8324: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8434: 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 "${as_me-configure}:8330: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me-configure}:8440: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8333 "configure"
+#line 8443 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8345,16 +8455,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8348: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8458: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8351: \$? = $ac_status" >&5
+  echo "$as_me:8461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8357: \$? = $ac_status" >&5
+  echo "$as_me:8467: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -8375,7 +8485,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 8378 "configure"
+#line 8488 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8390,16 +8500,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8393: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8396: \$? = $ac_status" >&5
+  echo "$as_me:8506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8402: \$? = $ac_status" >&5
+  echo "$as_me:8512: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8410,15 +8520,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me-configure}:8413: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me-configure}:8523: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me-configure}:8418: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me-configure}:8528: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8421 "configure"
+#line 8531 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8433,16 +8543,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8546: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8439: \$? = $ac_status" >&5
+  echo "$as_me:8549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8445: \$? = $ac_status" >&5
+  echo "$as_me:8555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8458,7 +8568,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8461: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:8571: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -8475,14 +8585,14 @@ fi
 	;;
 esac
 
-echo "$as_me:8478: checking if SIGWINCH is defined" >&5
+echo "$as_me:8588: checking if SIGWINCH is defined" >&5
 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8485 "configure"
+#line 8595 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8497,23 +8607,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8503: \$? = $ac_status" >&5
+  echo "$as_me:8613: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8509: \$? = $ac_status" >&5
+  echo "$as_me:8619: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 8516 "configure"
+#line 8626 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -8531,16 +8641,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8534: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8537: \$? = $ac_status" >&5
+  echo "$as_me:8647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8543: \$? = $ac_status" >&5
+  echo "$as_me:8653: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -8554,11 +8664,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8557: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:8667: result: $cf_cv_define_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:8561: checking for actual SIGWINCH definition" >&5
+echo "$as_me:8671: checking for actual SIGWINCH definition" >&5
 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8569,7 +8679,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8572 "configure"
+#line 8682 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -8591,16 +8701,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8594: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8704: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8597: \$? = $ac_status" >&5
+  echo "$as_me:8707: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8603: \$? = $ac_status" >&5
+  echo "$as_me:8713: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -8614,7 +8724,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:8617: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:8727: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -8626,7 +8736,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:8629: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:8739: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -8687,7 +8797,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:8690: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:8800: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -8695,7 +8805,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:8698: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:8808: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -8703,14 +8813,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:8706: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:8816: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 8713 "configure"
+#line 8823 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8722,16 +8832,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8728: \$? = $ac_status" >&5
+  echo "$as_me:8838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8734: \$? = $ac_status" >&5
+  echo "$as_me:8844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8739,12 +8849,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:8742: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:8852: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:8747: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:8857: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -8756,7 +8866,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:8759: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:8869: checking if you want NSS compatible SSL libraries" >&5
 echo $ECHO_N "checking if you want NSS compatible SSL libraries... $ECHO_C" >&6
 if test "${cf_cv_use_libnss_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8771,10 +8881,10 @@ else
 fi;
 
 fi
-echo "$as_me:8774: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:8884: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:8777: checking if you want ssl library" >&5
+echo "$as_me:8887: 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
@@ -8789,10 +8899,10 @@ else
 fi;
 
 fi
-echo "$as_me:8792: result: $cf_cv_use_libssl" >&5
+echo "$as_me:8902: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:8795: checking if you want gnutls support" >&5
+echo "$as_me:8905: checking if you want gnutls support" >&5
 echo $ECHO_N "checking if you want gnutls support... $ECHO_C" >&6
 if test "${cf_cv_use_libgnutls+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8807,11 +8917,11 @@ else
 fi;
 
 fi
-echo "$as_me:8810: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:8920: result: $cf_cv_use_libgnutls" >&5
 echo "${ECHO_T}$cf_cv_use_libgnutls" >&6
 
 # this option is mainly for comparing with/without Lynx's wrapper for GNUTLS.
-echo "$as_me:8814: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:8924: checking if you want gnutls-openssl compat" >&5
 echo $ECHO_N "checking if you want gnutls-openssl compat... $ECHO_C" >&6
 if test "${cf_cv_gnutls_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8826,10 +8936,10 @@ else
 fi;
 
 fi
-echo "$as_me:8829: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:8939: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:8832: checking if you want socks library" >&5
+echo "$as_me:8942: 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
@@ -8844,10 +8954,10 @@ else
 fi;
 
 fi
-echo "$as_me:8847: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:8957: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:8850: checking if you want socks5 library" >&5
+echo "$as_me:8960: 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
@@ -8862,7 +8972,7 @@ else
 fi;
 
 fi
-echo "$as_me:8865: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:8975: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -8901,7 +9011,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8904 "configure"
+#line 9014 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8913,16 +9023,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9026: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8919: \$? = $ac_status" >&5
+  echo "$as_me:9029: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8925: \$? = $ac_status" >&5
+  echo "$as_me:9035: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8939,7 +9049,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:8942: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9052: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -8980,7 +9090,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8983 "configure"
+#line 9093 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8992,16 +9102,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8995: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8998: \$? = $ac_status" >&5
+  echo "$as_me:9108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9004: \$? = $ac_status" >&5
+  echo "$as_me:9114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9018,7 +9128,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9021: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9131: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -9034,7 +9144,7 @@ echo "${as_me-configure}:9021: testing adding $cf_add_incdir to include-path ...
 fi
 
 	else
-{ { echo "$as_me:9037: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:9147: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9059,7 +9169,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:9062: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9172: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9088,7 +9198,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:9091: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9201: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9097,7 +9207,7 @@ echo "${as_me-configure}:9091: testing adding $cf_add_libdir to library-path ...
 fi
 
 	else
-{ { echo "$as_me:9100: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:9210: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9111,10 +9221,10 @@ done
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me-configure}:9114: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9224: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 9117 "configure"
+#line 9227 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9130,16 +9240,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9133: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9136: \$? = $ac_status" >&5
+  echo "$as_me:9246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9142: \$? = $ac_status" >&5
+  echo "$as_me:9252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_socks=yes
 else
@@ -9148,12 +9258,37 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_socks=no
 
-echo "${as_me-configure}:9151: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9261: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
-    cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/socks &&       cf_search="$cf_search $cf_header_path/include/socks"
+	test -d $cf_header_path/include/socks/include &&    cf_search="$cf_search $cf_header_path/include/socks/include"
+	test -d $cf_header_path/socks/include &&       cf_search="$cf_search $cf_header_path/socks/include"
+	test -d $cf_header_path/socks/include/socks &&    cf_search="$cf_search $cf_header_path/socks/include/socks"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -9224,16 +9359,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/socks && cf_search="$cf_search $oldincludedir/socks"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
     for cf_cv_header_path_socks in $cf_search
     do
       if test -d $cf_cv_header_path_socks ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:9232: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me-configure}:9369: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
         cat >conftest.$ac_ext <<_ACEOF
-#line 9236 "configure"
+#line 9373 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9249,21 +9386,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9389: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9255: \$? = $ac_status" >&5
+  echo "$as_me:9392: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9261: \$? = $ac_status" >&5
+  echo "$as_me:9398: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found socks headers in $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:9266: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me-configure}:9403: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
             cf_cv_find_linkage_socks=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9281,13 +9418,39 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me-configure}:9284: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9421: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
 
       if test "$cf_cv_find_linkage_socks" != yes ; then
-        cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/socks &&       cf_search="$cf_search $cf_library_path/lib/socks"
+	test -d $cf_library_path/lib/socks/lib &&    cf_search="$cf_search $cf_library_path/lib/socks/lib"
+	test -d $cf_library_path/socks/lib &&       cf_search="$cf_search $cf_library_path/socks/lib"
+	test -d $cf_library_path/socks/lib/socks &&    cf_search="$cf_search $cf_library_path/socks/lib/socks"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -9344,18 +9507,20 @@ test -d "$HOME" && \
 	test -d $HOME/socks/lib/socks &&    cf_search="$cf_search $HOME/socks/lib/socks"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
         for cf_cv_library_path_socks in $cf_search
         do
           if test -d $cf_cv_library_path_socks ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:9352: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me-configure}:9517: testing ... testing $cf_cv_library_path_socks ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lsocks  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks"
             cat >conftest.$ac_ext <<_ACEOF
-#line 9358 "configure"
+#line 9523 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9371,21 +9536,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9377: \$? = $ac_status" >&5
+  echo "$as_me:9542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9383: \$? = $ac_status" >&5
+  echo "$as_me:9548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found socks library in $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:9388: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me-configure}:9553: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
                 cf_cv_find_linkage_socks=yes
                 cf_cv_library_file_socks="-lsocks"
@@ -9481,7 +9646,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9484 "configure"
+#line 9649 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9493,16 +9658,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9496: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9499: \$? = $ac_status" >&5
+  echo "$as_me:9664: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9502: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9505: \$? = $ac_status" >&5
+  echo "$as_me:9670: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9519,7 +9684,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9522: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9687: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -9553,7 +9718,7 @@ if test -n "$cf_cv_library_path_socks" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:9556: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9721: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9563,7 +9728,7 @@ fi
 
     LIBS="$LIBS -lsocks"
   else
-    { { echo "$as_me:9566: error: cannot link with socks library" >&5
+    { { echo "$as_me:9731: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -9604,7 +9769,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9607 "configure"
+#line 9772 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9616,16 +9781,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9622: \$? = $ac_status" >&5
+  echo "$as_me:9787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9628: \$? = $ac_status" >&5
+  echo "$as_me:9793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9642,7 +9807,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9645: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9810: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -9683,7 +9848,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9686 "configure"
+#line 9851 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9695,16 +9860,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9698: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9701: \$? = $ac_status" >&5
+  echo "$as_me:9866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9707: \$? = $ac_status" >&5
+  echo "$as_me:9872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9721,7 +9886,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:9724: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9889: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -9737,7 +9902,7 @@ echo "${as_me-configure}:9724: testing adding $cf_add_incdir to include-path ...
 fi
 
 	else
-{ { echo "$as_me:9740: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:9905: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9762,7 +9927,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:9765: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9930: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9791,7 +9956,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:9794: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9959: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9800,7 +9965,7 @@ echo "${as_me-configure}:9794: testing adding $cf_add_libdir to library-path ...
 fi
 
 	else
-{ { echo "$as_me:9803: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:9968: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9819,11 +9984,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:9822: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:9987: 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 9826 "configure"
+#line 9991 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -9837,16 +10002,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9843: \$? = $ac_status" >&5
+  echo "$as_me:10008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9849: \$? = $ac_status" >&5
+  echo "$as_me:10014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
@@ -9857,7 +10022,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 9860 "configure"
+#line 10025 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -9869,29 +10034,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10037: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9875: \$? = $ac_status" >&5
+  echo "$as_me:10040: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9881: \$? = $ac_status" >&5
+  echo "$as_me:10046: \$? = $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:9887: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:10052: 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:9894: result: $cf_use_socks4" >&5
+echo "$as_me:10059: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -9946,10 +10111,10 @@ EOF
 
 fi
 
-echo "$as_me:9949: checking if socks5p.h is available" >&5
+echo "$as_me:10114: 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 9952 "configure"
+#line 10117 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -9964,16 +10129,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9970: \$? = $ac_status" >&5
+  echo "$as_me:10135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9976: \$? = $ac_status" >&5
+  echo "$as_me:10141: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -9982,7 +10147,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:9985: result: $cf_use_socks5p_h" >&5
+echo "$as_me:10150: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes && cat >>confdefs.h <<\EOF
@@ -9992,13 +10157,13 @@ EOF
 else
 
 cf_test_netlibs=no
-echo "$as_me:9995: checking for network libraries" >&5
+echo "$as_me:10160: 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:10001: result: working..." >&5
+echo "$as_me:10166: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 cf_cv_netlibs=""
 cf_test_netlibs=yes
@@ -10006,13 +10171,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:10009: checking for $ac_func" >&5
+echo "$as_me:10174: 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 10015 "configure"
+#line 10180 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10043,16 +10208,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10049: \$? = $ac_status" >&5
+  echo "$as_me:10214: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10055: \$? = $ac_status" >&5
+  echo "$as_me:10220: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10062,7 +10227,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10065: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10230: 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
@@ -10071,7 +10236,7 @@ EOF
 
 else
 
-echo "$as_me:10074: checking for gethostname in -lnsl" >&5
+echo "$as_me:10239: 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
@@ -10079,7 +10244,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10082 "configure"
+#line 10247 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10098,16 +10263,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10104: \$? = $ac_status" >&5
+  echo "$as_me:10269: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10110: \$? = $ac_status" >&5
+  echo "$as_me:10275: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -10118,7 +10283,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10121: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:10286: 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
 
@@ -10135,7 +10300,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:10138: checking for gethostname in -lsocket" >&5
+echo "$as_me:10303: 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
@@ -10143,7 +10308,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10146 "configure"
+#line 10311 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10162,16 +10327,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10168: \$? = $ac_status" >&5
+  echo "$as_me:10333: \$? = $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:10336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10174: \$? = $ac_status" >&5
+  echo "$as_me:10339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -10182,7 +10347,7 @@ 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_socket_gethostname" >&5
+echo "$as_me:10350: 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
 
@@ -10210,7 +10375,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:10213: checking for main in -linet" >&5
+echo "$as_me:10378: 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
@@ -10218,7 +10383,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10221 "configure"
+#line 10386 "configure"
 #include "confdefs.h"
 
 int
@@ -10230,16 +10395,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10398: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10236: \$? = $ac_status" >&5
+  echo "$as_me:10401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10242: \$? = $ac_status" >&5
+  echo "$as_me:10407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -10250,7 +10415,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10253: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:10418: 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"
@@ -10262,13 +10427,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:10265: checking for $ac_func" >&5
+echo "$as_me:10430: 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 10271 "configure"
+#line 10436 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10299,16 +10464,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10302: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10305: \$? = $ac_status" >&5
+  echo "$as_me:10470: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10311: \$? = $ac_status" >&5
+  echo "$as_me:10476: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10318,7 +10483,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10321: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10486: 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
@@ -10327,7 +10492,7 @@ EOF
 
 else
 
-echo "$as_me:10330: checking for socket in -lsocket" >&5
+echo "$as_me:10495: 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
@@ -10335,7 +10500,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10338 "configure"
+#line 10503 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10354,16 +10519,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10522: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10360: \$? = $ac_status" >&5
+  echo "$as_me:10525: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10366: \$? = $ac_status" >&5
+  echo "$as_me:10531: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -10374,7 +10539,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10377: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:10542: 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
 
@@ -10391,7 +10556,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:10394: checking for socket in -lbsd" >&5
+echo "$as_me:10559: 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
@@ -10399,7 +10564,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10402 "configure"
+#line 10567 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10418,16 +10583,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10424: \$? = $ac_status" >&5
+  echo "$as_me:10589: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10430: \$? = $ac_status" >&5
+  echo "$as_me:10595: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -10438,7 +10603,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10441: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:10606: 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
 
@@ -10468,13 +10633,13 @@ fi
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10471: checking for $ac_func" >&5
+echo "$as_me:10636: 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 10477 "configure"
+#line 10642 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10505,16 +10670,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10673: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10511: \$? = $ac_status" >&5
+  echo "$as_me:10676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10517: \$? = $ac_status" >&5
+  echo "$as_me:10682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10524,7 +10689,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10527: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10692: 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
@@ -10533,7 +10698,7 @@ EOF
 
 else
 
-echo "$as_me:10536: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:10701: 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
@@ -10541,7 +10706,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10544 "configure"
+#line 10709 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10560,16 +10725,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10566: \$? = $ac_status" >&5
+  echo "$as_me:10731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10572: \$? = $ac_status" >&5
+  echo "$as_me:10737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -10580,7 +10745,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10583: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:10748: 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
 
@@ -10607,13 +10772,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10610: checking for $ac_func" >&5
+echo "$as_me:10775: 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 10616 "configure"
+#line 10781 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10644,16 +10809,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10650: \$? = $ac_status" >&5
+  echo "$as_me:10815: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10656: \$? = $ac_status" >&5
+  echo "$as_me:10821: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10663,7 +10828,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10666: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10831: 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
@@ -10672,7 +10837,7 @@ EOF
 
 else
 
-echo "$as_me:10675: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:10840: 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
@@ -10680,7 +10845,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10683 "configure"
+#line 10848 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10699,16 +10864,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10705: \$? = $ac_status" >&5
+  echo "$as_me:10870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10711: \$? = $ac_status" >&5
+  echo "$as_me:10876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -10719,7 +10884,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10722: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:10887: 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
 
@@ -10748,14 +10913,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:10751: checking for inet_aton function" >&5
+echo "$as_me:10916: 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 10758 "configure"
+#line 10923 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -10771,16 +10936,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10939: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10777: \$? = $ac_status" >&5
+  echo "$as_me:10942: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10945: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10783: \$? = $ac_status" >&5
+  echo "$as_me:10948: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -10790,7 +10955,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10793: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:10958: 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
@@ -10798,14 +10963,14 @@ if test "$cf_cv_have_inet_aton" = yes ; then
 EOF
 
 else
-    echo "$as_me:10801: checking for inet_addr function" >&5
+    echo "$as_me:10966: 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 10808 "configure"
+#line 10973 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -10821,16 +10986,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10989: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10827: \$? = $ac_status" >&5
+  echo "$as_me:10992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10833: \$? = $ac_status" >&5
+  echo "$as_me:10998: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -10840,10 +11005,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10843: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:11008: 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:10846: checking for library with inet_addr" >&5
+	echo "$as_me:11011: 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
@@ -10854,7 +11019,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 10857 "configure"
+#line 11022 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -10870,16 +11035,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10873: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10876: \$? = $ac_status" >&5
+  echo "$as_me:11041: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10879: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10882: \$? = $ac_status" >&5
+  echo "$as_me:11047: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -10893,12 +11058,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:10896: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:11061: 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:10901: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:11066: 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
@@ -10940,7 +11105,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10943 "configure"
+#line 11108 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10952,16 +11117,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10958: \$? = $ac_status" >&5
+  echo "$as_me:11123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10964: \$? = $ac_status" >&5
+  echo "$as_me:11129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10978,7 +11143,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:10981: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:11146: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11019,7 +11184,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11022 "configure"
+#line 11187 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11031,16 +11196,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11037: \$? = $ac_status" >&5
+  echo "$as_me:11202: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11043: \$? = $ac_status" >&5
+  echo "$as_me:11208: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11057,7 +11222,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:11060: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:11225: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11073,7 +11238,7 @@ echo "${as_me-configure}:11060: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:11076: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:11241: 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
@@ -11098,7 +11263,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:11101: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:11266: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11127,7 +11292,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:11130: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:11295: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11136,7 +11301,7 @@ echo "${as_me-configure}:11130: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:11139: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:11304: 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
@@ -11150,10 +11315,10 @@ done
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me-configure}:11153: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11318: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11156 "configure"
+#line 11321 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11182,16 +11347,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11185: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11188: \$? = $ac_status" >&5
+  echo "$as_me:11353: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11194: \$? = $ac_status" >&5
+  echo "$as_me:11359: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_ssl=yes
 else
@@ -11200,12 +11365,37 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_ssl=no
 
-echo "${as_me-configure}:11203: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11368: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
-    cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/openssl &&       cf_search="$cf_search $cf_header_path/include/openssl"
+	test -d $cf_header_path/include/openssl/include &&    cf_search="$cf_search $cf_header_path/include/openssl/include"
+	test -d $cf_header_path/openssl/include &&       cf_search="$cf_search $cf_header_path/openssl/include"
+	test -d $cf_header_path/openssl/include/openssl &&    cf_search="$cf_search $cf_header_path/openssl/include/openssl"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -11276,16 +11466,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/openssl && cf_search="$cf_search $oldincludedir/openssl"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
     for cf_cv_header_path_ssl in $cf_search
     do
       if test -d $cf_cv_header_path_ssl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:11284: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:11476: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 11288 "configure"
+#line 11480 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11314,21 +11506,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11317: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11509: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11320: \$? = $ac_status" >&5
+  echo "$as_me:11512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11323: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11326: \$? = $ac_status" >&5
+  echo "$as_me:11518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl headers in $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:11331: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:11523: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
             cf_cv_find_linkage_ssl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11346,7 +11538,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me-configure}:11349: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11541: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -11354,7 +11546,7 @@ echo "${as_me-configure}:11349: testing Searching for ssl library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lssl -lcrypto $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 11357 "configure"
+#line 11549 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11383,21 +11575,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11578: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11389: \$? = $ac_status" >&5
+  echo "$as_me:11581: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11584: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11395: \$? = $ac_status" >&5
+  echo "$as_me:11587: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me-configure}:11400: testing ... found ssl library in system ..." 1>&5
+echo "${as_me-configure}:11592: testing ... found ssl library in system ..." 1>&5
 
             cf_cv_find_linkage_ssl=yes
 else
@@ -11409,7 +11601,33 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
             LIBS="$cf_save_LIBS"
 
       if test "$cf_cv_find_linkage_ssl" != yes ; then
-        cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/ssl &&       cf_search="$cf_search $cf_library_path/lib/ssl"
+	test -d $cf_library_path/lib/ssl/lib &&    cf_search="$cf_search $cf_library_path/lib/ssl/lib"
+	test -d $cf_library_path/ssl/lib &&       cf_search="$cf_search $cf_library_path/ssl/lib"
+	test -d $cf_library_path/ssl/lib/ssl &&    cf_search="$cf_search $cf_library_path/ssl/lib/ssl"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -11466,18 +11684,20 @@ test -d "$HOME" && \
 	test -d $HOME/ssl/lib/ssl &&    cf_search="$cf_search $HOME/ssl/lib/ssl"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
         for cf_cv_library_path_ssl in $cf_search
         do
           if test -d $cf_cv_library_path_ssl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:11474: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:11694: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lssl -lcrypto $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 11480 "configure"
+#line 11700 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11506,21 +11726,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11512: \$? = $ac_status" >&5
+  echo "$as_me:11732: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11518: \$? = $ac_status" >&5
+  echo "$as_me:11738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found ssl library in $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:11523: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:11743: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
                 cf_cv_find_linkage_ssl=yes
                 cf_cv_library_file_ssl="-lssl"
@@ -11599,7 +11819,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11602 "configure"
+#line 11822 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11611,16 +11831,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11834: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11617: \$? = $ac_status" >&5
+  echo "$as_me:11837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11623: \$? = $ac_status" >&5
+  echo "$as_me:11843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11637,7 +11857,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:11640: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:11860: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11677,7 +11897,7 @@ if test -n "$cf_cv_library_path_ssl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:11680: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:11900: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11688,10 +11908,10 @@ fi
     fi
     LIBS="-lssl -lcrypto $LIBS"
 
-echo "$as_me:11691: checking for X509 support" >&5
+echo "$as_me:11911: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 11694 "configure"
+#line 11914 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11715,16 +11935,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11938: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11721: \$? = $ac_status" >&5
+  echo "$as_me:11941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11727: \$? = $ac_status" >&5
+  echo "$as_me:11947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -11733,7 +11953,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:11736: result: $cf_x509_support" >&5
+echo "$as_me:11956: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -11782,7 +12002,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11785 "configure"
+#line 12005 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11794,16 +12014,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11800: \$? = $ac_status" >&5
+  echo "$as_me:12020: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11806: \$? = $ac_status" >&5
+  echo "$as_me:12026: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11820,7 +12040,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:11823: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12043: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11861,7 +12081,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11864 "configure"
+#line 12084 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11873,16 +12093,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11879: \$? = $ac_status" >&5
+  echo "$as_me:12099: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11885: \$? = $ac_status" >&5
+  echo "$as_me:12105: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11899,7 +12119,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:11902: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12122: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11915,7 +12135,7 @@ echo "${as_me-configure}:11902: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:11918: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:12138: 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
@@ -11940,7 +12160,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:11943: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12163: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11969,7 +12189,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:11972: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12192: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11978,7 +12198,7 @@ echo "${as_me-configure}:11972: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:11981: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:12201: 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
@@ -11998,10 +12218,10 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:12001: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:12221: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12004 "configure"
+#line 12224 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12030,16 +12250,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12036: \$? = $ac_status" >&5
+  echo "$as_me:12256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12042: \$? = $ac_status" >&5
+  echo "$as_me:12262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_gnutls=yes
 else
@@ -12048,12 +12268,37 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_gnutls=no
 
-echo "${as_me-configure}:12051: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:12271: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
-    cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/gnutls &&       cf_search="$cf_search $cf_header_path/include/gnutls"
+	test -d $cf_header_path/include/gnutls/include &&    cf_search="$cf_search $cf_header_path/include/gnutls/include"
+	test -d $cf_header_path/gnutls/include &&       cf_search="$cf_search $cf_header_path/gnutls/include"
+	test -d $cf_header_path/gnutls/include/gnutls &&    cf_search="$cf_search $cf_header_path/gnutls/include/gnutls"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -12124,16 +12369,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/gnutls && cf_search="$cf_search $oldincludedir/gnutls"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
     for cf_cv_header_path_gnutls in $cf_search
     do
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12132: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12379: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 12136 "configure"
+#line 12383 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12162,21 +12409,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12165: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12168: \$? = $ac_status" >&5
+  echo "$as_me:12415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12174: \$? = $ac_status" >&5
+  echo "$as_me:12421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12179: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12426: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12194,13 +12441,39 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:12197: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:12444: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
 
       if test "$cf_cv_find_linkage_gnutls" != yes ; then
-        cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/gnutls &&       cf_search="$cf_search $cf_library_path/lib/gnutls"
+	test -d $cf_library_path/lib/gnutls/lib &&    cf_search="$cf_search $cf_library_path/lib/gnutls/lib"
+	test -d $cf_library_path/gnutls/lib &&       cf_search="$cf_search $cf_library_path/gnutls/lib"
+	test -d $cf_library_path/gnutls/lib/gnutls &&    cf_search="$cf_search $cf_library_path/gnutls/lib/gnutls"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -12257,18 +12530,20 @@ test -d "$HOME" && \
 	test -d $HOME/gnutls/lib/gnutls &&    cf_search="$cf_search $HOME/gnutls/lib/gnutls"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
         for cf_cv_library_path_gnutls in $cf_search
         do
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12265: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12540: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls -lcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 12271 "configure"
+#line 12546 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12297,21 +12572,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12303: \$? = $ac_status" >&5
+  echo "$as_me:12578: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12309: \$? = $ac_status" >&5
+  echo "$as_me:12584: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12314: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12589: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -12383,7 +12658,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12386 "configure"
+#line 12661 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12395,16 +12670,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12401: \$? = $ac_status" >&5
+  echo "$as_me:12676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12407: \$? = $ac_status" >&5
+  echo "$as_me:12682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12421,7 +12696,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:12424: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12699: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12460,7 +12735,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:12463: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12738: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12474,10 +12749,10 @@ fi
 
   EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:12477: checking for X509 support" >&5
+echo "$as_me:12752: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 12480 "configure"
+#line 12755 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12501,16 +12776,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12504: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12779: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12507: \$? = $ac_status" >&5
+  echo "$as_me:12782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12513: \$? = $ac_status" >&5
+  echo "$as_me:12788: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -12519,7 +12794,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:12522: result: $cf_x509_support" >&5
+echo "$as_me:12797: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -12565,7 +12840,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12568 "configure"
+#line 12843 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12577,16 +12852,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12583: \$? = $ac_status" >&5
+  echo "$as_me:12858: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12589: \$? = $ac_status" >&5
+  echo "$as_me:12864: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12603,7 +12878,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:12606: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12881: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12644,7 +12919,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12647 "configure"
+#line 12922 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12656,16 +12931,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12662: \$? = $ac_status" >&5
+  echo "$as_me:12937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12668: \$? = $ac_status" >&5
+  echo "$as_me:12943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12682,7 +12957,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:12685: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12960: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12698,7 +12973,7 @@ echo "${as_me-configure}:12685: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:12701: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:12976: 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
@@ -12723,7 +12998,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:12726: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13001: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12752,7 +13027,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:12755: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13030: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12761,7 +13036,7 @@ echo "${as_me-configure}:12755: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:12764: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:13039: 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
@@ -12781,10 +13056,10 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:12784: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13059: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12787 "configure"
+#line 13062 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12813,16 +13088,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13091: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12819: \$? = $ac_status" >&5
+  echo "$as_me:13094: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12825: \$? = $ac_status" >&5
+  echo "$as_me:13100: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_gnutls=yes
 else
@@ -12831,12 +13106,37 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_gnutls=no
 
-echo "${as_me-configure}:12834: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13109: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
-    cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/gnutls &&       cf_search="$cf_search $cf_header_path/include/gnutls"
+	test -d $cf_header_path/include/gnutls/include &&    cf_search="$cf_search $cf_header_path/include/gnutls/include"
+	test -d $cf_header_path/gnutls/include &&       cf_search="$cf_search $cf_header_path/gnutls/include"
+	test -d $cf_header_path/gnutls/include/gnutls &&    cf_search="$cf_search $cf_header_path/gnutls/include/gnutls"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -12907,16 +13207,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/gnutls && cf_search="$cf_search $oldincludedir/gnutls"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
     for cf_cv_header_path_gnutls in $cf_search
     do
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12915: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13217: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 12919 "configure"
+#line 13221 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12945,21 +13247,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12948: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13250: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12951: \$? = $ac_status" >&5
+  echo "$as_me:13253: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12957: \$? = $ac_status" >&5
+  echo "$as_me:13259: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:12962: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13264: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12977,13 +13279,39 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:12980: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13282: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
 
       if test "$cf_cv_find_linkage_gnutls" != yes ; then
-        cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/gnutls &&       cf_search="$cf_search $cf_library_path/lib/gnutls"
+	test -d $cf_library_path/lib/gnutls/lib &&    cf_search="$cf_search $cf_library_path/lib/gnutls/lib"
+	test -d $cf_library_path/gnutls/lib &&       cf_search="$cf_search $cf_library_path/gnutls/lib"
+	test -d $cf_library_path/gnutls/lib/gnutls &&    cf_search="$cf_search $cf_library_path/gnutls/lib/gnutls"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -13040,18 +13368,20 @@ test -d "$HOME" && \
 	test -d $HOME/gnutls/lib/gnutls &&    cf_search="$cf_search $HOME/gnutls/lib/gnutls"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
         for cf_cv_library_path_gnutls in $cf_search
         do
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:13048: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13378: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 13054 "configure"
+#line 13384 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13080,21 +13410,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13086: \$? = $ac_status" >&5
+  echo "$as_me:13416: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13092: \$? = $ac_status" >&5
+  echo "$as_me:13422: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:13097: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13427: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -13166,7 +13496,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13169 "configure"
+#line 13499 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13178,16 +13508,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13511: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13184: \$? = $ac_status" >&5
+  echo "$as_me:13514: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13190: \$? = $ac_status" >&5
+  echo "$as_me:13520: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13204,7 +13534,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:13207: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13537: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -13243,7 +13573,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:13246: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13576: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13255,7 +13585,7 @@ fi
     LIBS="-lgnutls -lcrypt $LIBS"
   fi
 
-  echo "$as_me:13258: checking for SSL_connect in -lgnutls-openssl" >&5
+  echo "$as_me:13588: 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
@@ -13263,7 +13593,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13266 "configure"
+#line 13596 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13282,16 +13612,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13288: \$? = $ac_status" >&5
+  echo "$as_me:13618: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13294: \$? = $ac_status" >&5
+  echo "$as_me:13624: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -13302,12 +13632,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13305: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:13635: 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:13310: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:13640: 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
@@ -13315,7 +13645,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13318 "configure"
+#line 13648 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13334,16 +13664,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13667: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13340: \$? = $ac_status" >&5
+  echo "$as_me:13670: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13346: \$? = $ac_status" >&5
+  echo "$as_me:13676: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -13354,22 +13684,22 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13357: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:13687: 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:13362: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:13692: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-echo "$as_me:13369: checking for X509 support" >&5
+echo "$as_me:13699: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 13372 "configure"
+#line 13702 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13393,16 +13723,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13399: \$? = $ac_status" >&5
+  echo "$as_me:13729: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13405: \$? = $ac_status" >&5
+  echo "$as_me:13735: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -13411,7 +13741,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:13414: result: $cf_x509_support" >&5
+echo "$as_me:13744: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -13441,7 +13771,7 @@ no) #(vi
 	;;
 yes) #(vi
 
-echo "$as_me:13444: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:13774: checking for SSL_get_version in -lnss_compat_ossl" >&5
 echo $ECHO_N "checking for SSL_get_version in -lnss_compat_ossl... $ECHO_C" >&6
 if test "${ac_cv_lib_nss_compat_ossl_SSL_get_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13449,7 +13779,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13452 "configure"
+#line 13782 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13468,16 +13798,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13471: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13474: \$? = $ac_status" >&5
+  echo "$as_me:13804: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13480: \$? = $ac_status" >&5
+  echo "$as_me:13810: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -13488,7 +13818,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13491: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:13821: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
 echo "${ECHO_T}$ac_cv_lib_nss_compat_ossl_SSL_get_version" >&6
 if test $ac_cv_lib_nss_compat_ossl_SSL_get_version = yes; then
   cat >>confdefs.h <<EOF
@@ -13503,11 +13833,11 @@ else
 		if test -d $cf_ssl_root ; then
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-echo "${as_me-configure}:13506: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me-configure}:13836: testing assume it is in $cf_ssl_root ..." 1>&5
 
 			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 		else
-			{ { echo "$as_me:13510: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:13840: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -13522,13 +13852,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:13525: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:13855: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
 echo "$as_me: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 	else
-		{ echo "$as_me:13531: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:13861: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -13612,10 +13942,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:13615: checking for NSS compilant include directory" >&5
+echo "$as_me:13945: checking for NSS compilant include directory" >&5
 echo $ECHO_N "checking for NSS compilant include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 13618 "configure"
+#line 13948 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13629,16 +13959,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13632: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13635: \$? = $ac_status" >&5
+  echo "$as_me:13965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13641: \$? = $ac_status" >&5
+  echo "$as_me:13971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -13647,7 +13977,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:13650: result: $cf_ssl_incl" >&5
+echo "$as_me:13980: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes && cat >>confdefs.h <<\EOF
 #define USE_NSS_COMPAT_INCL 1
@@ -13655,10 +13985,10 @@ EOF
 
 fi
 
-echo "$as_me:13658: checking if we can link to NSS compilant library" >&5
+echo "$as_me:13988: checking if we can link to NSS compilant library" >&5
 echo $ECHO_N "checking if we can link to NSS compilant library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 13661 "configure"
+#line 13991 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13677,16 +14007,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13680: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13683: \$? = $ac_status" >&5
+  echo "$as_me:14013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13689: \$? = $ac_status" >&5
+  echo "$as_me:14019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -13695,7 +14025,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:13698: result: $cf_ssl_library" >&5
+echo "$as_me:14028: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -13707,7 +14037,7 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:13710: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:14040: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -13715,7 +14045,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:13718: checking whether to enable ipv6" >&5
+echo "$as_me:14048: 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.
@@ -13731,11 +14061,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:13734: result: $enableval" >&5
+echo "$as_me:14064: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:13738: checking ipv6 stack type" >&5
+echo "$as_me:14068: 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
@@ -13756,7 +14086,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 13759 "configure"
+#line 14089 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -13773,7 +14103,7 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 13776 "configure"
+#line 14106 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -13790,7 +14120,7 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 13793 "configure"
+#line 14123 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -13816,7 +14146,7 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13819 "configure"
+#line 14149 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -13833,7 +14163,7 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13836 "configure"
+#line 14166 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -13850,7 +14180,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13853 "configure"
+#line 14183 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -13872,13 +14202,13 @@ rm -f conftest*
 done
 
 fi
-echo "$as_me:13875: result: $cf_cv_ipv6type" >&5
+echo "$as_me:14205: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:13881: checking for IPv6 library if required" >&5
+echo "$as_me:14211: 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
@@ -13908,13 +14238,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:13911: result: $cf_ipv6lib" >&5
+echo "$as_me:14241: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 13917 "configure"
+#line 14247 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13930,23 +14260,48 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13933: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13936: \$? = $ac_status" >&5
+  echo "$as_me:14266: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13939: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13942: \$? = $ac_status" >&5
+  echo "$as_me:14272: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-	cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/$cf_ipv6dir &&       cf_search="$cf_search $cf_header_path/include/$cf_ipv6dir"
+	test -d $cf_header_path/include/$cf_ipv6dir/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ipv6dir/include"
+	test -d $cf_header_path/$cf_ipv6dir/include &&       cf_search="$cf_search $cf_header_path/$cf_ipv6dir/include"
+	test -d $cf_header_path/$cf_ipv6dir/include/$cf_ipv6dir &&    cf_search="$cf_search $cf_header_path/$cf_ipv6dir/include/$cf_ipv6dir"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -14017,6 +14372,8 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/$cf_ipv6dir && cf_search="$cf_search $oldincludedir/$cf_ipv6dir"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
 	for cf_incdir in $cf_search
 	do
 		cf_header=$cf_incdir/netinet/ip6.h
@@ -14047,7 +14404,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14050 "configure"
+#line 14407 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14059,16 +14416,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14419: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14065: \$? = $ac_status" >&5
+  echo "$as_me:14422: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14071: \$? = $ac_status" >&5
+  echo "$as_me:14428: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14085,7 +14442,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:14088: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:14445: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -14111,13 +14468,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:14114: checking for getaddrinfo" >&5
+	echo "$as_me:14471: 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 14120 "configure"
+#line 14477 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -14148,16 +14505,16 @@ f = getaddrinfo;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14151: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14154: \$? = $ac_status" >&5
+  echo "$as_me:14511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14160: \$? = $ac_status" >&5
+  echo "$as_me:14517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -14167,18 +14524,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14170: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:14527: 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:14177: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:14534: 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 14181 "configure"
+#line 14538 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14194,27 +14551,53 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14554: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14200: \$? = $ac_status" >&5
+  echo "$as_me:14557: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14206: \$? = $ac_status" >&5
+  echo "$as_me:14563: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:14208: result: yes" >&5
+  echo "$as_me:14565: 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:14215: result: no" >&5
+echo "$as_me:14572: result: no" >&5
 echo "${ECHO_T}no" >&6
-			cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/$cf_ipv6dir &&       cf_search="$cf_search $cf_library_path/lib/$cf_ipv6dir"
+	test -d $cf_library_path/lib/$cf_ipv6dir/lib &&    cf_search="$cf_search $cf_library_path/lib/$cf_ipv6dir/lib"
+	test -d $cf_library_path/$cf_ipv6dir/lib &&       cf_search="$cf_search $cf_library_path/$cf_ipv6dir/lib"
+	test -d $cf_library_path/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $cf_library_path/$cf_ipv6dir/lib/$cf_ipv6dir"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -14271,13 +14654,15 @@ test -d "$HOME" && \
 	test -d $HOME/$cf_ipv6dir/lib/$cf_ipv6dir &&    cf_search="$cf_search $HOME/$cf_ipv6dir/lib/$cf_ipv6dir"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:14276: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:14661: 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 14280 "configure"
+#line 14665 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14293,25 +14678,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14681: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14299: \$? = $ac_status" >&5
+  echo "$as_me:14684: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14305: \$? = $ac_status" >&5
+  echo "$as_me:14690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:14307: result: yes" >&5
+  echo "$as_me:14692: 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:14314: result: no" >&5
+echo "$as_me:14699: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -14326,7 +14711,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:14329: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:14714: 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;}
@@ -14334,7 +14719,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:14337: checking working getaddrinfo" >&5
+echo "$as_me:14722: 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
@@ -14344,7 +14729,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14347 "configure"
+#line 14732 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14424,15 +14809,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14430: \$? = $ac_status" >&5
+  echo "$as_me:14815: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14817: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14435: \$? = $ac_status" >&5
+  echo "$as_me:14820: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -14445,7 +14830,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:14448: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:14833: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -14460,12 +14845,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:14463: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:14848: 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:14468: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:14853: 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.
@@ -14476,7 +14861,7 @@ fi
 
 fi
 
-echo "$as_me:14479: checking for screen type" >&5
+echo "$as_me:14864: 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
@@ -14490,7 +14875,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:14493: error: Unexpected value" >&5
+*)	{ { echo "$as_me:14878: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14499,7 +14884,7 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:14502: result: $cf_cv_screen" >&5
+echo "$as_me:14887: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
@@ -14534,7 +14919,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:14537: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:14922: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -14553,7 +14938,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:14556: checking for extra include directories" >&5
+echo "$as_me:14941: 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
@@ -14573,11 +14958,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:14576: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:14961: 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:14580: checking if we have identified curses headers" >&5
+echo "$as_me:14965: 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
@@ -14591,7 +14976,7 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 14594 "configure"
+#line 14979 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -14603,16 +14988,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14991: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14609: \$? = $ac_status" >&5
+  echo "$as_me:14994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14615: \$? = $ac_status" >&5
+  echo "$as_me:15000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -14623,11 +15008,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:14626: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:15011: 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:14630: error: No curses header-files found" >&5
+	{ { echo "$as_me:15015: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -14637,23 +15022,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:14640: checking for $ac_header" >&5
+echo "$as_me:15025: 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 14646 "configure"
+#line 15031 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14650: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15035: \"$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:14656: \$? = $ac_status" >&5
+  echo "$as_me:15041: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14672,7 +15057,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:14675: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15060: 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
@@ -14682,7 +15067,7 @@ EOF
 fi
 done
 
-echo "$as_me:14685: checking for terminfo header" >&5
+echo "$as_me:15070: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14700,7 +15085,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 14703 "configure"
+#line 15088 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -14715,16 +15100,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14718: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15103: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14721: \$? = $ac_status" >&5
+  echo "$as_me:15106: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14724: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14727: \$? = $ac_status" >&5
+  echo "$as_me:15112: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -14740,7 +15125,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:14743: result: $cf_cv_term_header" >&5
+echo "$as_me:15128: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -14769,7 +15154,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:14772: checking for ncurses version" >&5
+echo "$as_me:15157: 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
@@ -14795,10 +15180,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:14798: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:15183: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:14801: \$? = $ac_status" >&5
+  echo "$as_me:15186: \$? = $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%".*%%'`
@@ -14808,7 +15193,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14811 "configure"
+#line 15196 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -14833,15 +15218,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15221: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14839: \$? = $ac_status" >&5
+  echo "$as_me:15224: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14844: \$? = $ac_status" >&5
+  echo "$as_me:15229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -14855,16 +15240,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:14858: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:15243: 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:14864: checking if we have identified curses libraries" >&5
+echo "$as_me:15249: 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 14867 "configure"
+#line 15252 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -14876,16 +15261,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14882: \$? = $ac_status" >&5
+  echo "$as_me:15267: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15270: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14888: \$? = $ac_status" >&5
+  echo "$as_me:15273: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -14894,13 +15279,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:14897: result: $cf_result" >&5
+echo "$as_me:15282: 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:14903: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:15288: 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
@@ -14908,7 +15293,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14911 "configure"
+#line 15296 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14927,16 +15312,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14933: \$? = $ac_status" >&5
+  echo "$as_me:15318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14939: \$? = $ac_status" >&5
+  echo "$as_me:15324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -14947,7 +15332,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14950: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:15335: 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"
@@ -14955,7 +15340,7 @@ fi
 
     ;;
 hpux10.*) #(vi
-    echo "$as_me:14958: checking for initscr in -lcur_colr" >&5
+    echo "$as_me:15343: 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
@@ -14963,7 +15348,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14966 "configure"
+#line 15351 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14982,16 +15367,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14988: \$? = $ac_status" >&5
+  echo "$as_me:15373: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14994: \$? = $ac_status" >&5
+  echo "$as_me:15379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -15002,7 +15387,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15005: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:15390: 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
 
@@ -15011,7 +15396,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-    echo "$as_me:15014: checking for initscr in -lHcurses" >&5
+    echo "$as_me:15399: 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
@@ -15019,7 +15404,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15022 "configure"
+#line 15407 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15038,16 +15423,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15426: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15044: \$? = $ac_status" >&5
+  echo "$as_me:15429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15050: \$? = $ac_status" >&5
+  echo "$as_me:15435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -15058,7 +15443,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15061: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:15446: 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
 
@@ -15093,7 +15478,7 @@ if test -n "/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:15096: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:15481: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15124,7 +15509,7 @@ if test -n "/usr/5lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:15127: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:15512: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15152,13 +15537,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:15155: checking for tgoto" >&5
+    echo "$as_me:15540: 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 15161 "configure"
+#line 15546 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -15189,16 +15574,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15195: \$? = $ac_status" >&5
+  echo "$as_me:15580: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15201: \$? = $ac_status" >&5
+  echo "$as_me:15586: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -15208,7 +15593,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15211: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:15596: 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
@@ -15217,7 +15602,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:15220: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:15605: 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
@@ -15225,7 +15610,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15228 "configure"
+#line 15613 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15244,16 +15629,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15632: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15250: \$? = $ac_status" >&5
+  echo "$as_me:15635: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15256: \$? = $ac_status" >&5
+  echo "$as_me:15641: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -15264,7 +15649,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15267: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:15652: 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
@@ -15276,10 +15661,10 @@ fi
 
     # Check for library containing initscr
     test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
-    for cf_curs_lib in $cf_check_list xcurses jcurses unknown
+ 	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
     do
         as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:15282: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:15667: 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
@@ -15287,7 +15672,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15290 "configure"
+#line 15675 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15306,16 +15691,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15694: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15312: \$? = $ac_status" >&5
+  echo "$as_me:15697: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15318: \$? = $ac_status" >&5
+  echo "$as_me:15703: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -15326,23 +15711,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15329: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:15714: 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:15336: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:15721: 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:15342: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:15727: 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 15345 "configure"
+#line 15730 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15354,16 +15739,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15360: \$? = $ac_status" >&5
+  echo "$as_me:15745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15366: \$? = $ac_status" >&5
+  echo "$as_me:15751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -15372,18 +15757,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:15375: result: $cf_result" >&5
+        echo "$as_me:15760: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:15377: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:15762: 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:15383: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:15768: 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 15386 "configure"
+#line 15771 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15395,16 +15780,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15401: \$? = $ac_status" >&5
+  echo "$as_me:15786: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15407: \$? = $ac_status" >&5
+  echo "$as_me:15792: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -15413,7 +15798,7 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 15416 "configure"
+#line 15801 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15425,16 +15810,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15813: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15431: \$? = $ac_status" >&5
+  echo "$as_me:15816: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15437: \$? = $ac_status" >&5
+  echo "$as_me:15822: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -15446,13 +15831,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:15449: result: $cf_result" >&5
+        echo "$as_me:15834: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
 fi
 
-echo "$as_me:15455: checking for curses performance tradeoff" >&5
+echo "$as_me:15840: 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
@@ -15460,7 +15845,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 15463 "configure"
+#line 15848 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15479,20 +15864,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15485: \$? = $ac_status" >&5
+  echo "$as_me:15870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15491: \$? = $ac_status" >&5
+  echo "$as_me:15876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15495 "configure"
+#line 15880 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -15512,16 +15897,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15518: \$? = $ac_status" >&5
+  echo "$as_me:15903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15524: \$? = $ac_status" >&5
+  echo "$as_me:15909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -15536,20 +15921,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:15539: result: $cf_cv_curs_performance" >&5
+echo "$as_me:15924: 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:15545: checking for curses touchline function" >&5
+echo "$as_me:15930: 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 15552 "configure"
+#line 15937 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15562,23 +15947,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15568: \$? = $ac_status" >&5
+  echo "$as_me:15953: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15574: \$? = $ac_status" >&5
+  echo "$as_me:15959: \$? = $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 15581 "configure"
+#line 15966 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15591,16 +15976,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15597: \$? = $ac_status" >&5
+  echo "$as_me:15982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15603: \$? = $ac_status" >&5
+  echo "$as_me:15988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -15612,7 +15997,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:15615: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:16000: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -15639,7 +16024,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:15642: checking for $ac_word" >&5
+echo "$as_me:16027: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15656,7 +16041,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_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:15659: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16044: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -15667,10 +16052,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:15670: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:16055: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:15673: result: no" >&5
+  echo "$as_me:16058: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -15728,7 +16113,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15731 "configure"
+#line 16116 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15740,16 +16125,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15746: \$? = $ac_status" >&5
+  echo "$as_me:16131: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15752: \$? = $ac_status" >&5
+  echo "$as_me:16137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15766,7 +16151,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:15769: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:16154: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -15783,7 +16168,7 @@ fi
 
 }
 
-echo "$as_me:15786: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:16171: 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
@@ -15795,7 +16180,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15798 "configure"
+#line 16183 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -15819,16 +16204,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16207: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15825: \$? = $ac_status" >&5
+  echo "$as_me:16210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15831: \$? = $ac_status" >&5
+  echo "$as_me:16216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -15843,21 +16228,47 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:15846: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:16231: 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:15853: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:16238: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	test -n "$verbose" && echo
-	cf_search=""
+
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
+	test -d $cf_header_path/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
+	test -d $cf_header_path/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
+	test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -15928,6 +16339,8 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
 	test -n "$verbose" && echo search path $cf_search
 	cf_save2_CPPFLAGS="$CPPFLAGS"
 	for cf_incdir in $cf_search
@@ -15957,7 +16370,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15960 "configure"
+#line 16373 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15969,16 +16382,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15975: \$? = $ac_status" >&5
+  echo "$as_me:16388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15981: \$? = $ac_status" >&5
+  echo "$as_me:16394: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15995,7 +16408,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:15998: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:16411: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -16016,7 +16429,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16019 "configure"
+#line 16432 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -16040,16 +16453,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16043: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16456: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16046: \$? = $ac_status" >&5
+  echo "$as_me:16459: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16052: \$? = $ac_status" >&5
+  echo "$as_me:16465: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -16070,12 +16483,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:16073: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:16486: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:16078: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:16491: 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%/[^/]*$%%'`
@@ -16108,7 +16521,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16111 "configure"
+#line 16524 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16120,16 +16533,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16123: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16536: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16126: \$? = $ac_status" >&5
+  echo "$as_me:16539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16132: \$? = $ac_status" >&5
+  echo "$as_me:16545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16146,7 +16559,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:16149: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:16562: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -16189,7 +16602,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:16192: checking for terminfo header" >&5
+echo "$as_me:16605: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16207,7 +16620,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 16210 "configure"
+#line 16623 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16222,16 +16635,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16228: \$? = $ac_status" >&5
+  echo "$as_me:16641: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16234: \$? = $ac_status" >&5
+  echo "$as_me:16647: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -16247,7 +16660,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16250: result: $cf_cv_term_header" >&5
+echo "$as_me:16663: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -16281,7 +16694,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:16284: checking for ncurses version" >&5
+echo "$as_me:16697: 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
@@ -16307,10 +16720,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:16310: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:16723: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:16313: \$? = $ac_status" >&5
+  echo "$as_me:16726: \$? = $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%".*%%'`
@@ -16320,7 +16733,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16323 "configure"
+#line 16736 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16345,15 +16758,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16351: \$? = $ac_status" >&5
+  echo "$as_me:16764: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16766: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16356: \$? = $ac_status" >&5
+  echo "$as_me:16769: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -16367,7 +16780,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:16370: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:16783: 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
@@ -16379,7 +16792,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:16382: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:16795: 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
@@ -16387,7 +16800,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16390 "configure"
+#line 16803 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16406,16 +16819,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16412: \$? = $ac_status" >&5
+  echo "$as_me:16825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16418: \$? = $ac_status" >&5
+  echo "$as_me:16831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -16426,10 +16839,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16429: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:16842: 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:16432: checking for initscr in -lgpm" >&5
+  echo "$as_me:16845: 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
@@ -16437,7 +16850,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16440 "configure"
+#line 16853 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16456,16 +16869,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16462: \$? = $ac_status" >&5
+  echo "$as_me:16875: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16468: \$? = $ac_status" >&5
+  echo "$as_me:16881: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -16476,7 +16889,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16479: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:16892: 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"
@@ -16491,7 +16904,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:16494: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:16907: 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
@@ -16499,7 +16912,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16502 "configure"
+#line 16915 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16518,16 +16931,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16524: \$? = $ac_status" >&5
+  echo "$as_me:16937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16530: \$? = $ac_status" >&5
+  echo "$as_me:16943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -16538,7 +16951,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16541: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:16954: 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"
@@ -16572,7 +16985,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:16575: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:16988: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -16585,13 +16998,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:16588: checking for initscr" >&5
+	echo "$as_me:17001: 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 16594 "configure"
+#line 17007 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -16622,16 +17035,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16628: \$? = $ac_status" >&5
+  echo "$as_me:17041: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16634: \$? = $ac_status" >&5
+  echo "$as_me:17047: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -16641,18 +17054,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16644: result: $ac_cv_func_initscr" >&5
+echo "$as_me:17057: 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:16651: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:17064: 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 16655 "configure"
+#line 17068 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16664,27 +17077,53 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16670: \$? = $ac_status" >&5
+  echo "$as_me:17083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16676: \$? = $ac_status" >&5
+  echo "$as_me:17089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16678: result: yes" >&5
+  echo "$as_me:17091: 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:16685: result: no" >&5
+echo "$as_me:17098: result: no" >&5
 echo "${ECHO_T}no" >&6
-			cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
+	test -d $cf_library_path/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
+	test -d $cf_library_path/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
+	test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -16741,13 +17180,15 @@ test -d "$HOME" && \
 	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:16746: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:17187: 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 16750 "configure"
+#line 17191 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16759,25 +17200,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16765: \$? = $ac_status" >&5
+  echo "$as_me:17206: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16771: \$? = $ac_status" >&5
+  echo "$as_me:17212: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16773: result: yes" >&5
+  echo "$as_me:17214: 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:16780: result: no" >&5
+echo "$as_me:17221: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -16792,7 +17233,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:16795: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:17236: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -16800,7 +17241,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:16803: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:17244: 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
@@ -16810,7 +17251,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16813 "configure"
+#line 17254 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16822,23 +17263,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16828: \$? = $ac_status" >&5
+  echo "$as_me:17269: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16834: \$? = $ac_status" >&5
+  echo "$as_me:17275: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:16836: result: yes" >&5
+  echo "$as_me:17277: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:16841: result: no" >&5
+echo "$as_me:17282: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -16856,7 +17297,7 @@ fi
 	;;
 ncursesw)
 
-echo "$as_me:16859: checking for multibyte character support" >&5
+echo "$as_me:17300: 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
@@ -16864,7 +17305,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16867 "configure"
+#line 17308 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -16877,24 +17318,31 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16883: \$? = $ac_status" >&5
+  echo "$as_me:17324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16889: \$? = $ac_status" >&5
+  echo "$as_me:17330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-LIBS="-lutf8 $LIBS"
-	 cat >conftest.$ac_ext <<_ACEOF
-#line 16897 "configure"
+
+# If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
+# will be set on completion of the AC_TRY_LINK below.
+cf_cv_header_path_utf8=
+cf_cv_library_path_utf8=
+
+echo "${as_me-configure}:17342: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+
+cat >conftest.$ac_ext <<_ACEOF
+#line 17345 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -16907,30 +17355,349 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17358: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16913: \$? = $ac_status" >&5
+  echo "$as_me:17361: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16919: \$? = $ac_status" >&5
+  echo "$as_me:17367: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  cf_cv_utf8_lib=add-on
+  cf_cv_find_linkage_utf8=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-cf_cv_utf8_lib=no
+
+    cf_cv_find_linkage_utf8=no
+
+echo "${as_me-configure}:17376: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+
+    cf_save_CPPFLAGS="$CPPFLAGS"
+    cf_test_CPPFLAGS="$CPPFLAGS"
+
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/utf8 &&       cf_search="$cf_search $cf_header_path/include/utf8"
+	test -d $cf_header_path/include/utf8/include &&    cf_search="$cf_search $cf_header_path/include/utf8/include"
+	test -d $cf_header_path/utf8/include &&       cf_search="$cf_search $cf_header_path/utf8/include"
+	test -d $cf_header_path/utf8/include/utf8 &&    cf_search="$cf_search $cf_header_path/utf8/include/utf8"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
+
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $prefix) && {
+	test -n "$verbose" && echo "	... testing for include-directories under /usr"
+	test -d /usr/include &&          cf_search="$cf_search /usr/include"
+	test -d /usr/include/utf8 &&       cf_search="$cf_search /usr/include/utf8"
+	test -d /usr/include/utf8/include &&    cf_search="$cf_search /usr/include/utf8/include"
+	test -d /usr/utf8/include &&       cf_search="$cf_search /usr/utf8/include"
+	test -d /usr/utf8/include/utf8 &&    cf_search="$cf_search /usr/utf8/include/utf8"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $prefix"
+	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
+	test -d $prefix/include/utf8 &&       cf_search="$cf_search $prefix/include/utf8"
+	test -d $prefix/include/utf8/include &&    cf_search="$cf_search $prefix/include/utf8/include"
+	test -d $prefix/utf8/include &&       cf_search="$cf_search $prefix/utf8/include"
+	test -d $prefix/utf8/include/utf8 &&    cf_search="$cf_search $prefix/utf8/include/utf8"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $prefix) && {
+	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
+	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
+	test -d /usr/local/include/utf8 &&       cf_search="$cf_search /usr/local/include/utf8"
+	test -d /usr/local/include/utf8/include &&    cf_search="$cf_search /usr/local/include/utf8/include"
+	test -d /usr/local/utf8/include &&       cf_search="$cf_search /usr/local/utf8/include"
+	test -d /usr/local/utf8/include/utf8 &&    cf_search="$cf_search /usr/local/utf8/include/utf8"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $prefix) && {
+	test -n "$verbose" && echo "	... testing for include-directories under /opt"
+	test -d /opt/include &&          cf_search="$cf_search /opt/include"
+	test -d /opt/include/utf8 &&       cf_search="$cf_search /opt/include/utf8"
+	test -d /opt/include/utf8/include &&    cf_search="$cf_search /opt/include/utf8/include"
+	test -d /opt/utf8/include &&       cf_search="$cf_search /opt/utf8/include"
+	test -d /opt/utf8/include/utf8 &&    cf_search="$cf_search /opt/utf8/include/utf8"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $prefix) && {
+	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
+	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
+	test -d $HOME/include/utf8 &&       cf_search="$cf_search $HOME/include/utf8"
+	test -d $HOME/include/utf8/include &&    cf_search="$cf_search $HOME/include/utf8/include"
+	test -d $HOME/utf8/include &&       cf_search="$cf_search $HOME/utf8/include"
+	test -d $HOME/utf8/include/utf8 &&    cf_search="$cf_search $HOME/utf8/include/utf8"
+}
+
+test "$includedir" != NONE && \
+test "$includedir" != "/usr/include" && \
+test -d "$includedir" && {
+	test -d $includedir &&    cf_search="$cf_search $includedir"
+	test -d $includedir/utf8 && cf_search="$cf_search $includedir/utf8"
+}
+
+test "$oldincludedir" != NONE && \
+test "$oldincludedir" != "/usr/include" && \
+test -d "$oldincludedir" && {
+	test -d $oldincludedir    && cf_search="$cf_search $oldincludedir"
+	test -d $oldincludedir/utf8 && cf_search="$cf_search $oldincludedir/utf8"
+}
+
+cf_search="$cf_header_path_list $cf_search"
+
+    for cf_cv_header_path_utf8 in $cf_search
+    do
+      if test -d $cf_cv_header_path_utf8 ; then
+        test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
+
+echo "${as_me-configure}:17484: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+
+        CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
+        cat >conftest.$ac_ext <<_ACEOF
+#line 17488 "configure"
+#include "confdefs.h"
+
+#include <libutf8.h>
+int
+main ()
+{
+putwc(0,0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:17501: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:17504: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:17507: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:17510: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+            test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
+
+echo "${as_me-configure}:17515: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+
+            cf_cv_find_linkage_utf8=maybe
+            cf_test_CPPFLAGS="$CPPFLAGS"
+            break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+            CPPFLAGS="$cf_save_CPPFLAGS"
+
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+      fi
+    done
+
+    if test "$cf_cv_find_linkage_utf8" = maybe ; then
+
+echo "${as_me-configure}:17533: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+
+      cf_save_LIBS="$LIBS"
+      cf_save_LDFLAGS="$LDFLAGS"
+
+      if test "$cf_cv_find_linkage_utf8" != yes ; then
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/utf8 &&       cf_search="$cf_search $cf_library_path/lib/utf8"
+	test -d $cf_library_path/lib/utf8/lib &&    cf_search="$cf_search $cf_library_path/lib/utf8/lib"
+	test -d $cf_library_path/utf8/lib &&       cf_search="$cf_search $cf_library_path/utf8/lib"
+	test -d $cf_library_path/utf8/lib/utf8 &&    cf_search="$cf_search $cf_library_path/utf8/lib/utf8"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
+
+test "/usr" != "$prefix" && \
+test -d "/usr" && \
+(test $prefix = NONE || test -d $prefix) && {
+	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
+	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
+	test -d /usr/lib/utf8 &&       cf_search="$cf_search /usr/lib/utf8"
+	test -d /usr/lib/utf8/lib &&    cf_search="$cf_search /usr/lib/utf8/lib"
+	test -d /usr/utf8/lib &&       cf_search="$cf_search /usr/utf8/lib"
+	test -d /usr/utf8/lib/utf8 &&    cf_search="$cf_search /usr/utf8/lib/utf8"
+}
+
+test "$prefix" != "NONE" && \
+test -d "$prefix" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
+	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
+	test -d $prefix/lib/utf8 &&       cf_search="$cf_search $prefix/lib/utf8"
+	test -d $prefix/lib/utf8/lib &&    cf_search="$cf_search $prefix/lib/utf8/lib"
+	test -d $prefix/utf8/lib &&       cf_search="$cf_search $prefix/utf8/lib"
+	test -d $prefix/utf8/lib/utf8 &&    cf_search="$cf_search $prefix/utf8/lib/utf8"
+}
+
+test "/usr/local" != "$prefix" && \
+test -d "/usr/local" && \
+(test $prefix = NONE || test -d $prefix) && {
+	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
+	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
+	test -d /usr/local/lib/utf8 &&       cf_search="$cf_search /usr/local/lib/utf8"
+	test -d /usr/local/lib/utf8/lib &&    cf_search="$cf_search /usr/local/lib/utf8/lib"
+	test -d /usr/local/utf8/lib &&       cf_search="$cf_search /usr/local/utf8/lib"
+	test -d /usr/local/utf8/lib/utf8 &&    cf_search="$cf_search /usr/local/utf8/lib/utf8"
+}
+
+test "/opt" != "$prefix" && \
+test -d "/opt" && \
+(test $prefix = NONE || test -d $prefix) && {
+	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
+	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
+	test -d /opt/lib/utf8 &&       cf_search="$cf_search /opt/lib/utf8"
+	test -d /opt/lib/utf8/lib &&    cf_search="$cf_search /opt/lib/utf8/lib"
+	test -d /opt/utf8/lib &&       cf_search="$cf_search /opt/utf8/lib"
+	test -d /opt/utf8/lib/utf8 &&    cf_search="$cf_search /opt/utf8/lib/utf8"
+}
+
+test "$HOME" != "$prefix" && \
+test -d "$HOME" && \
+(test $prefix = NONE || test -d $prefix) && {
+	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
+	test -d $HOME/lib/utf8 &&       cf_search="$cf_search $HOME/lib/utf8"
+	test -d $HOME/lib/utf8/lib &&    cf_search="$cf_search $HOME/lib/utf8/lib"
+	test -d $HOME/utf8/lib &&       cf_search="$cf_search $HOME/utf8/lib"
+	test -d $HOME/utf8/lib/utf8 &&    cf_search="$cf_search $HOME/utf8/lib/utf8"
+}
+
+cf_search="$cf_library_path_list $cf_search"
+
+        for cf_cv_library_path_utf8 in $cf_search
+        do
+          if test -d $cf_cv_library_path_utf8 ; then
+            test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
+
+echo "${as_me-configure}:17629: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+
+            CPPFLAGS="$cf_test_CPPFLAGS"
+            LIBS="-lutf8  $cf_save_LIBS"
+            LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
+            cat >conftest.$ac_ext <<_ACEOF
+#line 17635 "configure"
+#include "confdefs.h"
+
+#include <libutf8.h>
+int
+main ()
+{
+putwc(0,0);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:17648: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:17651: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:17654: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:17657: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+
+                test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
+
+echo "${as_me-configure}:17662: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+
+                cf_cv_find_linkage_utf8=yes
+                cf_cv_library_file_utf8="-lutf8"
+                break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+
+                CPPFLAGS="$cf_save_CPPFLAGS"
+                LIBS="$cf_save_LIBS"
+                LDFLAGS="$cf_save_LDFLAGS"
+
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-	LIBS="$cf_save_LIBS"
+          fi
+        done
+        LIBS="$cf_save_LIBS"
+        CPPFLAGS="$cf_save_CPPFLAGS"
+        LDFLAGS="$cf_save_LDFLAGS"
+      fi
+
+    else
+      cf_cv_find_linkage_utf8=no
+    fi
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
+if test "$cf_cv_find_linkage_utf8" = yes ; then
+cf_cv_utf8_lib=add-on
+else
+cf_cv_utf8_lib=no
+fi
+
 fi
-echo "$as_me:16933: result: $cf_cv_utf8_lib" >&5
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:17700: 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
@@ -16940,6 +17707,110 @@ if test "$cf_cv_utf8_lib" = "add-on" ; then
 #define HAVE_LIBUTF8_H 1
 EOF
 
+if test -n "$cf_cv_header_path_utf8" ; then
+  for cf_add_incdir in $cf_cv_header_path_utf8
+  do
+	while test $cf_add_incdir != /usr/include
+	do
+	  if test -d $cf_add_incdir
+	  then
+		cf_have_incdir=no
+		if test -n "$CFLAGS$CPPFLAGS" ; then
+		  # a loop is needed to ensure we can add subdirs of existing dirs
+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
+			  cf_have_incdir=yes; break
+			fi
+		  done
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+          if test "$cf_add_incdir" = /usr/local/include ; then
+			if test "$GCC" = yes
+			then
+			  cf_save_CPPFLAGS=$CPPFLAGS
+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+			  cat >conftest.$ac_ext <<_ACEOF
+#line 17734 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+int
+main ()
+{
+printf("Hello")
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:17746: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:17749: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:17752: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:17755: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_have_incdir=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+			  CPPFLAGS=$cf_save_CPPFLAGS
+			fi
+		  fi
+		fi
+
+		if test "$cf_have_incdir" = no ; then
+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
+
+echo "${as_me-configure}:17772: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
+
+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
+          test "$cf_top_incdir" = "$cf_add_incdir" && break
+          cf_add_incdir="$cf_top_incdir"
+		else
+		  break
+		fi
+	  fi
+	done
+  done
+fi
+
+if test -n "$cf_cv_library_path_utf8" ; then
+  for cf_add_libdir in $cf_cv_library_path_utf8
+  do
+    if test $cf_add_libdir = /usr/lib ; then
+      :
+    elif test -d $cf_add_libdir
+    then
+      cf_have_libdir=no
+      if test -n "$LDFLAGS$LIBS" ; then
+        # a loop is needed to ensure we can add subdirs of existing dirs
+        for cf_test_libdir in $LDFLAGS $LIBS ; do
+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
+            cf_have_libdir=yes; break
+          fi
+        done
+      fi
+      if test "$cf_have_libdir" = no ; then
+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
+
+echo "${as_me-configure}:17806: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+      fi
+    fi
+  done
+fi
+
 	LIBS="-lutf8 $LIBS"
 fi
 
@@ -16950,7 +17821,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16953: checking for $ac_word" >&5
+echo "$as_me:17824: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16967,7 +17838,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_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:16970: found $ac_dir/$ac_word" >&5
+   echo "$as_me:17841: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16978,10 +17849,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:16981: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:17852: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:16984: result: no" >&5
+  echo "$as_me:17855: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17039,7 +17910,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17042 "configure"
+#line 17913 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17051,16 +17922,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17925: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17057: \$? = $ac_status" >&5
+  echo "$as_me:17928: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17063: \$? = $ac_status" >&5
+  echo "$as_me:17934: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17077,7 +17948,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:17080: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:17951: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -17094,7 +17965,7 @@ fi
 
 }
 
-echo "$as_me:17097: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:17968: 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
@@ -17106,7 +17977,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17109 "configure"
+#line 17980 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -17138,16 +18009,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17144: \$? = $ac_status" >&5
+  echo "$as_me:18015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17150: \$? = $ac_status" >&5
+  echo "$as_me:18021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -17162,21 +18033,47 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:17165: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:18036: 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:17172: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:18043: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	test -n "$verbose" && echo
-	cf_search=""
+
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/$cf_ncuhdr_root &&       cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root"
+	test -d $cf_header_path/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $cf_header_path/include/$cf_ncuhdr_root/include"
+	test -d $cf_header_path/$cf_ncuhdr_root/include &&       cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include"
+	test -d $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $cf_header_path/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -17247,6 +18144,8 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/$cf_ncuhdr_root && cf_search="$cf_search $oldincludedir/$cf_ncuhdr_root"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
 	test -n "$verbose" && echo search path $cf_search
 	cf_save2_CPPFLAGS="$CPPFLAGS"
 	for cf_incdir in $cf_search
@@ -17276,7 +18175,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17279 "configure"
+#line 18178 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17288,16 +18187,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17294: \$? = $ac_status" >&5
+  echo "$as_me:18193: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17300: \$? = $ac_status" >&5
+  echo "$as_me:18199: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17314,7 +18213,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:17317: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18216: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -17335,7 +18234,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17338 "configure"
+#line 18237 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -17359,16 +18258,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17365: \$? = $ac_status" >&5
+  echo "$as_me:18264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17371: \$? = $ac_status" >&5
+  echo "$as_me:18270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -17389,12 +18288,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:17392: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18291: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:17397: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:18296: 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%/[^/]*$%%'`
@@ -17427,7 +18326,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17430 "configure"
+#line 18329 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17439,16 +18338,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17445: \$? = $ac_status" >&5
+  echo "$as_me:18344: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17451: \$? = $ac_status" >&5
+  echo "$as_me:18350: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17465,7 +18364,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:17468: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18367: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -17508,7 +18407,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:17511: checking for terminfo header" >&5
+echo "$as_me:18410: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17526,7 +18425,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 17529 "configure"
+#line 18428 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17541,16 +18440,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18443: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17547: \$? = $ac_status" >&5
+  echo "$as_me:18446: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17553: \$? = $ac_status" >&5
+  echo "$as_me:18452: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -17566,7 +18465,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:17569: result: $cf_cv_term_header" >&5
+echo "$as_me:18468: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -17600,7 +18499,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:17603: checking for ncurses version" >&5
+echo "$as_me:18502: 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
@@ -17626,10 +18525,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:17629: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:18528: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:17632: \$? = $ac_status" >&5
+  echo "$as_me:18531: \$? = $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%".*%%'`
@@ -17639,7 +18538,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17642 "configure"
+#line 18541 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17664,15 +18563,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18566: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17670: \$? = $ac_status" >&5
+  echo "$as_me:18569: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17675: \$? = $ac_status" >&5
+  echo "$as_me:18574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -17686,7 +18585,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:17689: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:18588: 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
@@ -17698,7 +18597,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:17701: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:18600: 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
@@ -17706,7 +18605,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17709 "configure"
+#line 18608 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17725,16 +18624,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17731: \$? = $ac_status" >&5
+  echo "$as_me:18630: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17737: \$? = $ac_status" >&5
+  echo "$as_me:18636: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -17745,10 +18644,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17748: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:18647: 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:17751: checking for initscr in -lgpm" >&5
+  echo "$as_me:18650: 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
@@ -17756,7 +18655,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17759 "configure"
+#line 18658 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17775,16 +18674,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17778: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18677: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17781: \$? = $ac_status" >&5
+  echo "$as_me:18680: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17787: \$? = $ac_status" >&5
+  echo "$as_me:18686: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -17795,7 +18694,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17798: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:18697: 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"
@@ -17810,7 +18709,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:17813: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:18712: 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
@@ -17818,7 +18717,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17821 "configure"
+#line 18720 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17837,16 +18736,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17843: \$? = $ac_status" >&5
+  echo "$as_me:18742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17849: \$? = $ac_status" >&5
+  echo "$as_me:18748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -17857,7 +18756,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17860: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:18759: 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"
@@ -17891,7 +18790,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:17894: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:18793: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17904,13 +18803,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:17907: checking for initscr" >&5
+	echo "$as_me:18806: 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 17913 "configure"
+#line 18812 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -17941,16 +18840,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18843: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17947: \$? = $ac_status" >&5
+  echo "$as_me:18846: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17953: \$? = $ac_status" >&5
+  echo "$as_me:18852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -17960,18 +18859,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17963: result: $ac_cv_func_initscr" >&5
+echo "$as_me:18862: 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:17970: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:18869: 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 17974 "configure"
+#line 18873 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17983,27 +18882,53 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17989: \$? = $ac_status" >&5
+  echo "$as_me:18888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17995: \$? = $ac_status" >&5
+  echo "$as_me:18894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17997: result: yes" >&5
+  echo "$as_me:18896: 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:18004: result: no" >&5
+echo "$as_me:18903: result: no" >&5
 echo "${ECHO_T}no" >&6
-			cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/$cf_nculib_root &&       cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root"
+	test -d $cf_library_path/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $cf_library_path/lib/$cf_nculib_root/lib"
+	test -d $cf_library_path/$cf_nculib_root/lib &&       cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib"
+	test -d $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $cf_library_path/$cf_nculib_root/lib/$cf_nculib_root"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -18060,13 +18985,15 @@ test -d "$HOME" && \
 	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18065: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:18992: 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 18069 "configure"
+#line 18996 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -18078,25 +19005,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19008: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18084: \$? = $ac_status" >&5
+  echo "$as_me:19011: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18090: \$? = $ac_status" >&5
+  echo "$as_me:19017: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18092: result: yes" >&5
+  echo "$as_me:19019: 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:18099: result: no" >&5
+echo "$as_me:19026: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18111,7 +19038,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:18114: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:19041: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18119,7 +19046,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:18122: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:19049: 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
@@ -18129,7 +19056,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18132 "configure"
+#line 19059 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -18141,23 +19068,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18147: \$? = $ac_status" >&5
+  echo "$as_me:19074: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18153: \$? = $ac_status" >&5
+  echo "$as_me:19080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18155: result: yes" >&5
+  echo "$as_me:19082: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18160: result: no" >&5
+echo "$as_me:19087: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -18180,14 +19107,14 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:18183: checking for slang header file" >&5
+echo "$as_me:19110: 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 18190 "configure"
+#line 19117 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -18199,23 +19126,48 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18205: \$? = $ac_status" >&5
+  echo "$as_me:19132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18211: \$? = $ac_status" >&5
+  echo "$as_me:19138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
-	cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/slang &&       cf_search="$cf_search $cf_header_path/include/slang"
+	test -d $cf_header_path/include/slang/include &&    cf_search="$cf_search $cf_header_path/include/slang/include"
+	test -d $cf_header_path/slang/include &&       cf_search="$cf_search $cf_header_path/slang/include"
+	test -d $cf_header_path/slang/include/slang &&    cf_search="$cf_search $cf_header_path/slang/include/slang"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -18286,6 +19238,8 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/slang && cf_search="$cf_search $oldincludedir/slang"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
 	for cf_incdir in $cf_search
 	do
 		for cf_header in \
@@ -18299,14 +19253,14 @@ test -d "$oldincludedir" && {
 		done
 		test -n "$cf_cv_slang_header" && break
 	done
-	test -z "$cf_cv_slang_header" && { { echo "$as_me:18302: error: not found" >&5
+	test -z "$cf_cv_slang_header" && { { echo "$as_me:19256: 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:18309: result: $cf_cv_slang_header" >&5
+echo "$as_me:19263: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 cat >>confdefs.h <<\EOF
 #define USE_SLANG 1
@@ -18343,7 +19297,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18346 "configure"
+#line 19300 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18355,16 +19309,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18358: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18361: \$? = $ac_status" >&5
+  echo "$as_me:19315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18367: \$? = $ac_status" >&5
+  echo "$as_me:19321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18381,7 +19335,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:18384: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:19338: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -18401,14 +19355,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:18404: checking if we must define UTF8" >&5
+echo "$as_me:19358: 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 18411 "configure"
+#line 19365 "configure"
 #include "confdefs.h"
 
 #include <slang.h>
@@ -18421,16 +19375,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18424: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18427: \$? = $ac_status" >&5
+  echo "$as_me:19381: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18433: \$? = $ac_status" >&5
+  echo "$as_me:19387: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -18438,7 +19392,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18441 "configure"
+#line 19395 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -18452,16 +19406,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18455: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18458: \$? = $ac_status" >&5
+  echo "$as_me:19412: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18464: \$? = $ac_status" >&5
+  echo "$as_me:19418: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -18474,7 +19428,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:18477: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:19431: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -18492,7 +19446,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 18495 "configure"
+#line 19449 "configure"
 #include "confdefs.h"
 
 int
@@ -18504,19 +19458,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19461: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18510: \$? = $ac_status" >&5
+  echo "$as_me:19464: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18516: \$? = $ac_status" >&5
+  echo "$as_me:19470: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 18519 "configure"
+#line 19473 "configure"
 #include "confdefs.h"
 
 int
@@ -18528,16 +19482,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18534: \$? = $ac_status" >&5
+  echo "$as_me:19488: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18540: \$? = $ac_status" >&5
+  echo "$as_me:19494: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -18548,7 +19502,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me-configure}:18551: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me-configure}:19505: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -18563,10 +19517,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:18566: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:19520: 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 18569 "configure"
+#line 19523 "configure"
 #include "confdefs.h"
 
 int
@@ -18578,16 +19532,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19535: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18584: \$? = $ac_status" >&5
+  echo "$as_me:19538: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18590: \$? = $ac_status" >&5
+  echo "$as_me:19544: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -18596,7 +19550,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:18599: result: $cf_result" >&5
+		echo "$as_me:19553: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -18613,7 +19567,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:18616: checking for initscr in -lcurses" >&5
+	echo "$as_me:19570: 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
@@ -18621,7 +19575,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18624 "configure"
+#line 19578 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18640,16 +19594,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18643: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19597: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18646: \$? = $ac_status" >&5
+  echo "$as_me:19600: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18652: \$? = $ac_status" >&5
+  echo "$as_me:19606: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -18660,13 +19614,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18663: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:19617: 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:18669: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:19623: 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
@@ -18674,7 +19628,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18677 "configure"
+#line 19631 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18693,16 +19647,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18699: \$? = $ac_status" >&5
+  echo "$as_me:19653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18705: \$? = $ac_status" >&5
+  echo "$as_me:19659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -18713,7 +19667,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18716: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:19670: 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
@@ -18724,20 +19678,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:18727: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:19681: 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:18734: checking for acos" >&5
+echo "$as_me:19688: 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 18740 "configure"
+#line 19694 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -18768,16 +19722,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18771: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18774: \$? = $ac_status" >&5
+  echo "$as_me:19728: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18780: \$? = $ac_status" >&5
+  echo "$as_me:19734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -18787,13 +19741,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18790: result: $ac_cv_func_acos" >&5
+echo "$as_me:19744: 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:18796: checking for acos in -lm" >&5
+echo "$as_me:19750: 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
@@ -18801,7 +19755,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18804 "configure"
+#line 19758 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18820,16 +19774,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18826: \$? = $ac_status" >&5
+  echo "$as_me:19780: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18832: \$? = $ac_status" >&5
+  echo "$as_me:19786: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -18840,7 +19794,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18843: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:19797: 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
 
@@ -18866,13 +19820,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:18869: checking for v_init" >&5
+	echo "$as_me:19823: 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 18875 "configure"
+#line 19829 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -18903,16 +19857,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19860: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18909: \$? = $ac_status" >&5
+  echo "$as_me:19863: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18915: \$? = $ac_status" >&5
+  echo "$as_me:19869: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -18922,18 +19876,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18925: result: $ac_cv_func_v_init" >&5
+echo "$as_me:19879: 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:18932: checking for v_init in -lvideo" >&5
+		echo "$as_me:19886: 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 18936 "configure"
+#line 19890 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -18945,27 +19899,53 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18948: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19902: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18951: \$? = $ac_status" >&5
+  echo "$as_me:19905: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18957: \$? = $ac_status" >&5
+  echo "$as_me:19911: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18959: result: yes" >&5
+  echo "$as_me:19913: 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:18966: result: no" >&5
+echo "$as_me:19920: result: no" >&5
 echo "${ECHO_T}no" >&6
-			cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/video &&       cf_search="$cf_search $cf_library_path/lib/video"
+	test -d $cf_library_path/lib/video/lib &&    cf_search="$cf_search $cf_library_path/lib/video/lib"
+	test -d $cf_library_path/video/lib &&       cf_search="$cf_search $cf_library_path/video/lib"
+	test -d $cf_library_path/video/lib/video &&    cf_search="$cf_search $cf_library_path/video/lib/video"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -19022,13 +20002,15 @@ test -d "$HOME" && \
 	test -d $HOME/video/lib/video &&    cf_search="$cf_search $HOME/video/lib/video"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:19027: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:20009: 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 19031 "configure"
+#line 20013 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -19040,25 +20022,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19046: \$? = $ac_status" >&5
+  echo "$as_me:20028: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19052: \$? = $ac_status" >&5
+  echo "$as_me:20034: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19054: result: yes" >&5
+  echo "$as_me:20036: 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:19061: result: no" >&5
+echo "$as_me:20043: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -19073,7 +20055,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:19076: error: Cannot link video library" >&5
+	{ { echo "$as_me:20058: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19083,13 +20065,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:19086: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:20068: 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 19092 "configure"
+#line 20074 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -19120,16 +20102,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20105: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19126: \$? = $ac_status" >&5
+  echo "$as_me:20108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19132: \$? = $ac_status" >&5
+  echo "$as_me:20114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -19139,18 +20121,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:19142: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:20124: 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:19149: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:20131: 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 19153 "configure"
+#line 20135 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -19162,27 +20144,53 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19168: \$? = $ac_status" >&5
+  echo "$as_me:20150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19174: \$? = $ac_status" >&5
+  echo "$as_me:20156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19176: result: yes" >&5
+  echo "$as_me:20158: 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:19183: result: no" >&5
+echo "$as_me:20165: result: no" >&5
 echo "${ECHO_T}no" >&6
-			cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/slang &&       cf_search="$cf_search $cf_library_path/lib/slang"
+	test -d $cf_library_path/lib/slang/lib &&    cf_search="$cf_search $cf_library_path/lib/slang/lib"
+	test -d $cf_library_path/slang/lib &&       cf_search="$cf_search $cf_library_path/slang/lib"
+	test -d $cf_library_path/slang/lib/slang &&    cf_search="$cf_search $cf_library_path/slang/lib/slang"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -19239,13 +20247,15 @@ test -d "$HOME" && \
 	test -d $HOME/slang/lib/slang &&    cf_search="$cf_search $HOME/slang/lib/slang"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:19244: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:20254: 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 19248 "configure"
+#line 20258 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -19257,25 +20267,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19263: \$? = $ac_status" >&5
+  echo "$as_me:20273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19269: \$? = $ac_status" >&5
+  echo "$as_me:20279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19271: result: yes" >&5
+  echo "$as_me:20281: 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:19278: result: no" >&5
+echo "$as_me:20288: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -19290,13 +20300,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:19293: error: Cannot link slang library" >&5
+	{ { echo "$as_me:20303: 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:19299: checking if we can link slang without termcap" >&5
+echo "$as_me:20309: 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%^.%%'`
@@ -19305,7 +20315,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 19308 "configure"
+#line 20318 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -19317,16 +20327,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19320: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20330: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19323: \$? = $ac_status" >&5
+  echo "$as_me:20333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19329: \$? = $ac_status" >&5
+  echo "$as_me:20339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19335,18 +20345,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:19338: result: $cf_result" >&5
+echo "$as_me:20348: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
-echo "$as_me:19342: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:20352: 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 19349 "configure"
+#line 20359 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -19365,16 +20375,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19368: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20378: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19371: \$? = $ac_status" >&5
+  echo "$as_me:20381: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19377: \$? = $ac_status" >&5
+  echo "$as_me:20387: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -19385,7 +20395,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:19388: result: $cf_cv_slang_unix" >&5
+echo "$as_me:20398: 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
@@ -19395,7 +20405,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19398: checking if you want the wide-curses features" >&5
+echo "$as_me:20408: checking if you want the wide-curses features" >&5
 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
@@ -19412,10 +20422,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:19415: result: $use_wide_curses" >&5
+echo "$as_me:20425: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:19418: checking if color-style code should be used" >&5
+echo "$as_me:20428: 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.
@@ -19435,7 +20445,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:19438: result: no" >&5
+	echo "$as_me:20448: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -19444,10 +20454,10 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:19447: result: yes" >&5
+	echo "$as_me:20457: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:19450: checking for location of style-sheet file" >&5
+	echo "$as_me:20460: checking for location of style-sheet file" >&5
 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
 
 # Check whether --with-lss-file or --without-lss-file was given.
@@ -19483,7 +20493,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:19486: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:20496: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -19492,7 +20502,7 @@ esac
 fi
 LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:19495: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:20505: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -19504,7 +20514,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19507: checking for the default configuration-file" >&5
+echo "$as_me:20517: checking for the default configuration-file" >&5
 echo $ECHO_N "checking for the default configuration-file... $ECHO_C" >&6
 
 # Check whether --with-cfg-file or --without-cfg-file was given.
@@ -19540,7 +20550,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:19543: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:20553: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -19549,7 +20559,7 @@ esac
 fi
 LYNX_CFG_FILE="$withval"
 
-echo "$as_me:19552: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:20562: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -19557,7 +20567,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:19560: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:20570: checking if htmlized lynx.cfg should be built" >&5
 echo $ECHO_N "checking if htmlized lynx.cfg should be built... $ECHO_C" >&6
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
@@ -19574,7 +20584,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:19577: result: $use_htmlized_cfg" >&5
+echo "$as_me:20587: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -19582,7 +20592,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:19585: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:20595: checking if local doc directory should be linked to help page" >&5
 echo $ECHO_N "checking if local doc directory should be linked to help page... $ECHO_C" >&6
 
 # Check whether --enable-local-docs or --disable-local-docs was given.
@@ -19599,7 +20609,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:19602: result: $use_local_docs" >&5
+echo "$as_me:20612: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -19607,7 +20617,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:19610: checking for MIME library directory" >&5
+echo "$as_me:20620: checking for MIME library directory" >&5
 echo $ECHO_N "checking for MIME library directory... $ECHO_C" >&6
 
 # Check whether --with-mime-libdir or --without-mime-libdir was given.
@@ -19643,7 +20653,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:19646: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:20656: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -19652,14 +20662,14 @@ esac
 fi
 MIME_LIBDIR="$withval"
 
-echo "$as_me:19655: result: $MIME_LIBDIR" >&5
+echo "$as_me:20665: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:19662: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:20672: checking if locale-charset selection logic should be used" >&5
 echo $ECHO_N "checking if locale-charset selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-locale-charset or --disable-locale-charset was given.
@@ -19676,7 +20686,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:19679: result: $use_locale_charset" >&5
+echo "$as_me:20689: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no && cat >>confdefs.h <<\EOF
 #define USE_LOCALE_CHARSET 1
@@ -19684,7 +20694,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:19687: checking if you want only a few charsets" >&5
+echo "$as_me:20697: 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.
@@ -19696,7 +20706,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:19699: result: yes" >&5
+	echo "$as_me:20709: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -19709,7 +20719,7 @@ EOF
 	if test "$cf_charsets" = "minimal" ; then
 		test -n "$verbose" && echo "	using minimal list of charsets: $cf_min_charsets" 1>&6
 
-echo "${as_me-configure}:19712: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me-configure}:20722: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
 
 	fi
 	cf_charsets=`echo $cf_charsets | sed -e "s/minimal/$cf_min_charsets/g" -e 's/,/ /g'`
@@ -19736,28 +20746,28 @@ echo "${as_me-configure}:19712: testing using minimal list of charsets: $cf_min_
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me-configure}:19739: testing found $cf_charset ..." 1>&5
+echo "${as_me-configure}:20749: testing found $cf_charset ..." 1>&5
 
 			CHARSET_DEFS="-DNO_CHARSET_${cf_def_charset}=0 $CHARSET_DEFS"
 		else
 			test -n "$verbose" && echo "	not found $cf_charset" 1>&6
 
-echo "${as_me-configure}:19745: testing not found $cf_charset ..." 1>&5
+echo "${as_me-configure}:20755: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:19750: result: no" >&5
+	echo "$as_me:20760: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:19754: checking for ANSI C header files" >&5
+echo "$as_me:20764: 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 19760 "configure"
+#line 20770 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -19765,13 +20775,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:19768: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20778: \"$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:19774: \$? = $ac_status" >&5
+  echo "$as_me:20784: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19793,7 +20803,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 19796 "configure"
+#line 20806 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -19811,7 +20821,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 19814 "configure"
+#line 20824 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -19832,7 +20842,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19835 "configure"
+#line 20845 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -19858,15 +20868,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20871: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19864: \$? = $ac_status" >&5
+  echo "$as_me:20874: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19869: \$? = $ac_status" >&5
+  echo "$as_me:20879: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19879,7 +20889,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:19882: result: $ac_cv_header_stdc" >&5
+echo "$as_me:20892: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -19889,13 +20899,13 @@ EOF
 
 fi
 
-echo "$as_me:19892: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:20902: 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 19898 "configure"
+#line 20908 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -19911,16 +20921,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19917: \$? = $ac_status" >&5
+  echo "$as_me:20927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19923: \$? = $ac_status" >&5
+  echo "$as_me:20933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -19930,7 +20940,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19933: result: $ac_cv_header_time" >&5
+echo "$as_me:20943: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -19943,13 +20953,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:19946: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:20956: 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 19952 "configure"
+#line 20962 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -19964,16 +20974,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19970: \$? = $ac_status" >&5
+  echo "$as_me:20980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19976: \$? = $ac_status" >&5
+  echo "$as_me:20986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -19983,7 +20993,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19986: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20996: 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
@@ -19996,7 +21006,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:19999: checking for opendir in -ldir" >&5
+  echo "$as_me:21009: 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
@@ -20004,7 +21014,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20007 "configure"
+#line 21017 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20023,16 +21033,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21036: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20029: \$? = $ac_status" >&5
+  echo "$as_me:21039: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20035: \$? = $ac_status" >&5
+  echo "$as_me:21045: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -20043,14 +21053,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20046: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:21056: 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:20053: checking for opendir in -lx" >&5
+  echo "$as_me:21063: 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
@@ -20058,7 +21068,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20061 "configure"
+#line 21071 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20077,16 +21087,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21090: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20083: \$? = $ac_status" >&5
+  echo "$as_me:21093: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20089: \$? = $ac_status" >&5
+  echo "$as_me:21099: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -20097,7 +21107,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20100: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:21110: 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"
@@ -20125,23 +21135,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20128: checking for $ac_header" >&5
+echo "$as_me:21138: 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 20134 "configure"
+#line 21144 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20138: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21148: \"$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:20144: \$? = $ac_status" >&5
+  echo "$as_me:21154: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20160,7 +21170,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20163: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21173: 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
@@ -20170,14 +21180,14 @@ EOF
 fi
 done
 
-echo "$as_me:20173: checking termio.h and termios.h" >&5
+echo "$as_me:21183: 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 20180 "configure"
+#line 21190 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -20195,16 +21205,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20198: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20201: \$? = $ac_status" >&5
+  echo "$as_me:21211: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20207: \$? = $ac_status" >&5
+  echo "$as_me:21217: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -20215,20 +21225,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:20218: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:21228: 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:20224: checking for sigaction and structs" >&5
+echo "$as_me:21234: 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 20231 "configure"
+#line 21241 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20248,16 +21258,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21261: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20254: \$? = $ac_status" >&5
+  echo "$as_me:21264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20260: \$? = $ac_status" >&5
+  echo "$as_me:21270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -20268,7 +21278,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:20271: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:21281: 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
@@ -20277,23 +21287,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:20280: checking for $ac_header" >&5
+echo "$as_me:21290: 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 20286 "configure"
+#line 21296 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20290: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21300: \"$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:20296: \$? = $ac_status" >&5
+  echo "$as_me:21306: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20312,7 +21322,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20315: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21325: 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
@@ -20333,23 +21343,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20336: checking for $ac_header" >&5
+echo "$as_me:21346: 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 20342 "configure"
+#line 21352 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20346: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21356: \"$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:20352: \$? = $ac_status" >&5
+  echo "$as_me:21362: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20368,7 +21378,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20371: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21381: 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
@@ -20381,23 +21391,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20384: checking for $ac_header" >&5
+echo "$as_me:21394: 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 20390 "configure"
+#line 21400 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20394: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21404: \"$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:20400: \$? = $ac_status" >&5
+  echo "$as_me:21410: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20416,7 +21426,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20419: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21429: 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
@@ -20438,14 +21448,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:20441: checking for union wait" >&5
+echo "$as_me:21451: 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 20448 "configure"
+#line 21458 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -20461,16 +21471,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20467: \$? = $ac_status" >&5
+  echo "$as_me:21477: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20473: \$? = $ac_status" >&5
+  echo "$as_me:21483: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -20480,7 +21490,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20483 "configure"
+#line 21493 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -20500,16 +21510,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20506: \$? = $ac_status" >&5
+  echo "$as_me:21516: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20512: \$? = $ac_status" >&5
+  echo "$as_me:21522: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -20524,7 +21534,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:20527: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:21537: 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
@@ -20532,14 +21542,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:20535: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:21545: 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 20542 "configure"
+#line 21552 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -20551,16 +21561,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20554: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20557: \$? = $ac_status" >&5
+  echo "$as_me:21567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20563: \$? = $ac_status" >&5
+  echo "$as_me:21573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -20572,20 +21582,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:20575: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:21585: 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:20581: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:21591: 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 20588 "configure"
+#line 21598 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -20597,16 +21607,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20603: \$? = $ac_status" >&5
+  echo "$as_me:21613: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20609: \$? = $ac_status" >&5
+  echo "$as_me:21619: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -20618,7 +21628,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:20621: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:21631: 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
@@ -20629,23 +21639,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:20632: checking for $ac_header" >&5
+echo "$as_me:21642: 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 20638 "configure"
+#line 21648 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20642: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21652: \"$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:20648: \$? = $ac_status" >&5
+  echo "$as_me:21658: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20664,7 +21674,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20667: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21677: 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
@@ -20674,14 +21684,14 @@ EOF
 fi
 done
 
-echo "$as_me:20677: checking for standard varargs" >&5
+echo "$as_me:21687: 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 20684 "configure"
+#line 21694 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDARG_H
@@ -20701,16 +21711,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:20704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21714: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20707: \$? = $ac_status" >&5
+  echo "$as_me:21717: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21720: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20713: \$? = $ac_status" >&5
+  echo "$as_me:21723: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_varargs=yes
 else
@@ -20722,19 +21732,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:20725: result: $cf_cv_ansi_varargs" >&5
+echo "$as_me:21735: 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:20731: checking for uid_t in sys/types.h" >&5
+echo "$as_me:21741: 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 20737 "configure"
+#line 21747 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -20748,7 +21758,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:20751: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:21761: 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
 
@@ -20762,7 +21772,7 @@ EOF
 
 fi
 
-echo "$as_me:20765: checking type of array argument to getgroups" >&5
+echo "$as_me:21775: 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
@@ -20771,7 +21781,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20774 "configure"
+#line 21784 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -20797,15 +21807,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20803: \$? = $ac_status" >&5
+  echo "$as_me:21813: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20808: \$? = $ac_status" >&5
+  echo "$as_me:21818: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -20818,7 +21828,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 20821 "configure"
+#line 21831 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -20833,20 +21843,20 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:20836: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:21846: 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:20843: checking for off_t" >&5
+echo "$as_me:21853: 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 20849 "configure"
+#line 21859 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -20861,16 +21871,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20867: \$? = $ac_status" >&5
+  echo "$as_me:21877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20873: \$? = $ac_status" >&5
+  echo "$as_me:21883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -20880,7 +21890,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20883: result: $ac_cv_type_off_t" >&5
+echo "$as_me:21893: 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
   :
@@ -20892,13 +21902,13 @@ EOF
 
 fi
 
-echo "$as_me:20895: checking for pid_t" >&5
+echo "$as_me:21905: 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 20901 "configure"
+#line 21911 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -20913,16 +21923,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20919: \$? = $ac_status" >&5
+  echo "$as_me:21929: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20925: \$? = $ac_status" >&5
+  echo "$as_me:21935: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -20932,7 +21942,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20935: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:21945: 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
   :
@@ -20944,13 +21954,13 @@ EOF
 
 fi
 
-echo "$as_me:20947: checking for uid_t in sys/types.h" >&5
+echo "$as_me:21957: 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 20953 "configure"
+#line 21963 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -20964,7 +21974,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:20967: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:21977: 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
 
@@ -20978,13 +21988,13 @@ EOF
 
 fi
 
-echo "$as_me:20981: checking for mode_t" >&5
+echo "$as_me:21991: 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 20987 "configure"
+#line 21997 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -20999,16 +22009,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21002: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21005: \$? = $ac_status" >&5
+  echo "$as_me:22015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21011: \$? = $ac_status" >&5
+  echo "$as_me:22021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -21018,7 +22028,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21021: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:22031: 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
   :
@@ -21030,13 +22040,13 @@ EOF
 
 fi
 
-	echo "$as_me:21033: checking for socklen_t" >&5
+	echo "$as_me:22043: 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 21039 "configure"
+#line 22049 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 
@@ -21052,16 +22062,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21058: \$? = $ac_status" >&5
+  echo "$as_me:22068: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21064: \$? = $ac_status" >&5
+  echo "$as_me:22074: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -21071,7 +22081,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21074: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:22084: 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
@@ -21086,14 +22096,14 @@ EOF
 
 fi
 
-echo "$as_me:21089: checking for tm.tm_gmtoff" >&5
+echo "$as_me:22099: checking for tm.tm_gmtoff" >&5
 echo $ECHO_N "checking for tm.tm_gmtoff... $ECHO_C" >&6
 if test "${cf_cv_tm_gmtoff+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21096 "configure"
+#line 22106 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -21118,16 +22128,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22131: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21124: \$? = $ac_status" >&5
+  echo "$as_me:22134: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21130: \$? = $ac_status" >&5
+  echo "$as_me:22140: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -21138,19 +22148,256 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:21141: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:22151: result: $cf_cv_tm_gmtoff" >&5
 echo "${ECHO_T}$cf_cv_tm_gmtoff" >&6
 test $cf_cv_tm_gmtoff = no && cat >>confdefs.h <<\EOF
 #define DONT_HAVE_TM_GMTOFF 1
 EOF
 
-echo "$as_me:21147: checking for off_t" >&5
+echo "$as_me:22157: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6
+if test "${ac_cv_type_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 22163 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+if ((long *) 0)
+  return 0;
+if (sizeof (long))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:22178: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:22181: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:22184: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:22187: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_long=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_type_long=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:22197: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6
+
+echo "$as_me:22200: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6
+if test "${ac_cv_sizeof_long+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test "$ac_cv_type_long" = yes; then
+  if test "$cross_compiling" = yes; then
+  # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+#line 22209 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:22221: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:22224: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:22227: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:22230: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=0 ac_mid=0
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line 22235 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:22247: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:22250: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:22253: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:22256: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  done
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_hi=-1 ac_mid=-1
+  while :; do
+    cat >conftest.$ac_ext <<_ACEOF
+#line 22272 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:22284: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:22287: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:22290: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:22293: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_lo=$ac_mid; break
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+  done
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+  cat >conftest.$ac_ext <<_ACEOF
+#line 22309 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:22321: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:22324: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:22327: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:22330: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_hi=$ac_mid
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_lo=`expr $ac_mid + 1`
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+done
+ac_cv_sizeof_long=$ac_lo
+else
+  if test "$cross_compiling" = yes; then
+  { { echo "$as_me:22343: error: cannot run test program while cross compiling" >&5
+echo "$as_me: error: cannot run test program while cross compiling" >&2;}
+   { (exit 1); exit 1; }; }
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 22348 "configure"
+#include "confdefs.h"
+$ac_includes_default
+int
+main ()
+{
+FILE *f = fopen ("conftest.val", "w");
+if (!f)
+  $ac_main_return (1);
+fprintf (f, "%d", (sizeof (long)));
+fclose (f);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:22364: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:22367: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:22369: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:22372: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_sizeof_long=`cat conftest.val`
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+else
+  ac_cv_sizeof_long=0
+fi
+fi
+echo "$as_me:22388: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+cat >>confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+
+echo "$as_me:22394: 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 21153 "configure"
+#line 22400 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21165,16 +22412,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21171: \$? = $ac_status" >&5
+  echo "$as_me:22418: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21177: \$? = $ac_status" >&5
+  echo "$as_me:22424: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -21184,10 +22431,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21187: result: $ac_cv_type_off_t" >&5
+echo "$as_me:22434: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:21190: checking size of off_t" >&5
+echo "$as_me:22437: checking size of off_t" >&5
 echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_off_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21196,7 +22443,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 21199 "configure"
+#line 22446 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21208,21 +22455,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21211: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22458: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21214: \$? = $ac_status" >&5
+  echo "$as_me:22461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21220: \$? = $ac_status" >&5
+  echo "$as_me:22467: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 21225 "configure"
+#line 22472 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21234,16 +22481,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21237: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21240: \$? = $ac_status" >&5
+  echo "$as_me:22487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21246: \$? = $ac_status" >&5
+  echo "$as_me:22493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -21259,7 +22506,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 21262 "configure"
+#line 22509 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21271,16 +22518,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21277: \$? = $ac_status" >&5
+  echo "$as_me:22524: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21283: \$? = $ac_status" >&5
+  echo "$as_me:22530: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -21296,7 +22543,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 21299 "configure"
+#line 22546 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21308,16 +22555,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22558: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21314: \$? = $ac_status" >&5
+  echo "$as_me:22561: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21320: \$? = $ac_status" >&5
+  echo "$as_me:22567: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -21330,12 +22577,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:21333: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22580: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21338 "configure"
+#line 22585 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21351,15 +22598,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21357: \$? = $ac_status" >&5
+  echo "$as_me:22604: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21362: \$? = $ac_status" >&5
+  echo "$as_me:22609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -21375,19 +22622,19 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:21378: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:22625: result: $ac_cv_sizeof_off_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
 EOF
 
-echo "$as_me:21384: checking for time_t" >&5
+echo "$as_me:22631: checking for time_t" >&5
 echo $ECHO_N "checking for time_t... $ECHO_C" >&6
 if test "${ac_cv_type_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21390 "configure"
+#line 22637 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21402,16 +22649,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21405: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21408: \$? = $ac_status" >&5
+  echo "$as_me:22655: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21414: \$? = $ac_status" >&5
+  echo "$as_me:22661: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -21421,10 +22668,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21424: result: $ac_cv_type_time_t" >&5
+echo "$as_me:22671: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:21427: checking size of time_t" >&5
+echo "$as_me:22674: checking size of time_t" >&5
 echo $ECHO_N "checking size of time_t... $ECHO_C" >&6
 if test "${ac_cv_sizeof_time_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21433,7 +22680,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 21436 "configure"
+#line 22683 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21445,21 +22692,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22695: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21451: \$? = $ac_status" >&5
+  echo "$as_me:22698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21457: \$? = $ac_status" >&5
+  echo "$as_me:22704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 21462 "configure"
+#line 22709 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21471,16 +22718,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22721: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21477: \$? = $ac_status" >&5
+  echo "$as_me:22724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21483: \$? = $ac_status" >&5
+  echo "$as_me:22730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -21496,7 +22743,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 21499 "configure"
+#line 22746 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21508,16 +22755,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21514: \$? = $ac_status" >&5
+  echo "$as_me:22761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21520: \$? = $ac_status" >&5
+  echo "$as_me:22767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -21533,7 +22780,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 21536 "configure"
+#line 22783 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21545,16 +22792,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22795: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21551: \$? = $ac_status" >&5
+  echo "$as_me:22798: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21557: \$? = $ac_status" >&5
+  echo "$as_me:22804: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -21567,12 +22814,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:21570: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22817: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21575 "configure"
+#line 22822 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21588,15 +22835,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22838: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21594: \$? = $ac_status" >&5
+  echo "$as_me:22841: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21599: \$? = $ac_status" >&5
+  echo "$as_me:22846: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -21612,7 +22859,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:21615: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:22862: result: $ac_cv_sizeof_time_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_time_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
@@ -21620,13 +22867,13 @@ EOF
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:21623: checking for working alloca.h" >&5
+echo "$as_me:22870: 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 21629 "configure"
+#line 22876 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -21638,16 +22885,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21641: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22888: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21644: \$? = $ac_status" >&5
+  echo "$as_me:22891: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21650: \$? = $ac_status" >&5
+  echo "$as_me:22897: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -21657,7 +22904,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21660: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:22907: 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
 
@@ -21667,13 +22914,13 @@ EOF
 
 fi
 
-echo "$as_me:21670: checking for alloca" >&5
+echo "$as_me:22917: 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 21676 "configure"
+#line 22923 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -21705,16 +22952,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22955: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21711: \$? = $ac_status" >&5
+  echo "$as_me:22958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21717: \$? = $ac_status" >&5
+  echo "$as_me:22964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -21724,7 +22971,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21727: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:22974: 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
@@ -21745,13 +22992,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:21748: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:22995: 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 21754 "configure"
+#line 23001 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -21769,18 +23016,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:21772: result: $ac_cv_os_cray" >&5
+echo "$as_me:23019: 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:21777: checking for $ac_func" >&5
+echo "$as_me:23024: 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 21783 "configure"
+#line 23030 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -21811,16 +23058,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21814: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21817: \$? = $ac_status" >&5
+  echo "$as_me:23064: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21823: \$? = $ac_status" >&5
+  echo "$as_me:23070: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -21830,7 +23077,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21833: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:23080: 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
 
@@ -21844,7 +23091,7 @@ fi
   done
 fi
 
-echo "$as_me:21847: checking stack direction for C alloca" >&5
+echo "$as_me:23094: 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
@@ -21853,7 +23100,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21856 "configure"
+#line 23103 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -21876,15 +23123,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21882: \$? = $ac_status" >&5
+  echo "$as_me:23129: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21887: \$? = $ac_status" >&5
+  echo "$as_me:23134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -21896,7 +23143,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:21899: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:23146: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -21908,23 +23155,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:21911: checking for $ac_header" >&5
+echo "$as_me:23158: 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 21917 "configure"
+#line 23164 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21921: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:23168: \"$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:21927: \$? = $ac_status" >&5
+  echo "$as_me:23174: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21943,7 +23190,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21946: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:23193: 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
@@ -21956,13 +23203,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:21959: checking for $ac_func" >&5
+echo "$as_me:23206: 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 21965 "configure"
+#line 23212 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -21993,16 +23240,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21999: \$? = $ac_status" >&5
+  echo "$as_me:23246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22005: \$? = $ac_status" >&5
+  echo "$as_me:23252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22012,7 +23259,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22015: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:23262: 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
@@ -22024,7 +23271,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:22027: checking for working fork" >&5
+  echo "$as_me:23274: 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
@@ -22047,15 +23294,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22053: \$? = $ac_status" >&5
+  echo "$as_me:23300: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22058: \$? = $ac_status" >&5
+  echo "$as_me:23305: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -22067,7 +23314,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:22070: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:23317: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -22081,12 +23328,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:22084: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23331: 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:22089: checking for working vfork" >&5
+  echo "$as_me:23336: 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
@@ -22095,7 +23342,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22098 "configure"
+#line 23345 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -22192,15 +23439,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22198: \$? = $ac_status" >&5
+  echo "$as_me:23445: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22203: \$? = $ac_status" >&5
+  echo "$as_me:23450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -22212,13 +23459,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:22215: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:23462: 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:22221: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23468: 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
 
@@ -22243,14 +23490,14 @@ EOF
 
 fi
 
-echo "$as_me:22246: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:23493: 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 22253 "configure"
+#line 23500 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22267,16 +23514,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22273: \$? = $ac_status" >&5
+  echo "$as_me:23520: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22279: \$? = $ac_status" >&5
+  echo "$as_me:23526: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -22284,7 +23531,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22287 "configure"
+#line 23534 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22306,16 +23553,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22312: \$? = $ac_status" >&5
+  echo "$as_me:23559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22318: \$? = $ac_status" >&5
+  echo "$as_me:23565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -22328,20 +23575,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:22331: result: $cf_cv_fionbio" >&5
+echo "$as_me:23578: 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:22337: checking for broken/missing definition of remove" >&5
+echo "$as_me:23584: 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 22344 "configure"
+#line 23591 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22353,23 +23600,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22356: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22359: \$? = $ac_status" >&5
+  echo "$as_me:23606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22365: \$? = $ac_status" >&5
+  echo "$as_me:23612: \$? = $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 22372 "configure"
+#line 23619 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -22382,16 +23629,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23632: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22388: \$? = $ac_status" >&5
+  echo "$as_me:23635: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22394: \$? = $ac_status" >&5
+  echo "$as_me:23641: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -22406,20 +23653,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:22409: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:23656: 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:22415: checking for lstat" >&5
+echo "$as_me:23662: 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 22422 "configure"
+#line 23669 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22433,16 +23680,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22436: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22439: \$? = $ac_status" >&5
+  echo "$as_me:23686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22445: \$? = $ac_status" >&5
+  echo "$as_me:23692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -22454,7 +23701,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:22457: result: $ac_cv_func_lstat " >&5
+echo "$as_me:23704: 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
@@ -22488,13 +23735,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22491: checking for $ac_func" >&5
+echo "$as_me:23738: 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 22497 "configure"
+#line 23744 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -22525,16 +23772,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22528: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23775: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22531: \$? = $ac_status" >&5
+  echo "$as_me:23778: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22537: \$? = $ac_status" >&5
+  echo "$as_me:23784: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22544,7 +23791,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22547: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:23794: 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
@@ -22560,13 +23807,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:22563: checking for $ac_func" >&5
+echo "$as_me:23810: 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 22569 "configure"
+#line 23816 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -22597,16 +23844,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22600: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22603: \$? = $ac_status" >&5
+  echo "$as_me:23850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22609: \$? = $ac_status" >&5
+  echo "$as_me:23856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -22616,7 +23863,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22619: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:23866: 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
@@ -22628,7 +23875,7 @@ else
 fi
 done
 
-echo "$as_me:22631: checking for random-integer functions" >&5
+echo "$as_me:23878: 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
@@ -22648,7 +23895,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22651 "configure"
+#line 23898 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -22667,16 +23914,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:22670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23917: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22673: \$? = $ac_status" >&5
+  echo "$as_me:23920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22679: \$? = $ac_status" >&5
+  echo "$as_me:23926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -22688,10 +23935,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22691: result: $cf_cv_srand_func" >&5
+echo "$as_me:23938: 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:22694: checking for range of random-integers" >&5
+	echo "$as_me:23941: 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
@@ -22712,7 +23959,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22715 "configure"
+#line 23962 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -22731,16 +23978,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22734: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23981: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22737: \$? = $ac_status" >&5
+  echo "$as_me:23984: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22743: \$? = $ac_status" >&5
+  echo "$as_me:23990: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22751,7 +23998,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:22754: result: $cf_cv_rand_max" >&5
+echo "$as_me:24001: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
@@ -22782,13 +24029,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:22785: checking for $ac_func declaration" >&5
+echo "$as_me:24032: 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 22791 "configure"
+#line 24038 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -22802,20 +24049,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24052: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22808: \$? = $ac_status" >&5
+  echo "$as_me:24055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22814: \$? = $ac_status" >&5
+  echo "$as_me:24061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22818 "configure"
+#line 24065 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -22829,16 +24076,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24079: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22835: \$? = $ac_status" >&5
+  echo "$as_me:24082: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22841: \$? = $ac_status" >&5
+  echo "$as_me:24088: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -22859,11 +24106,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:22862: result: yes" >&5
+  echo "$as_me:24109: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:22866: result: no" >&5
+  echo "$as_me:24113: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -22878,13 +24125,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:22881: checking for $ac_func declaration" >&5
+echo "$as_me:24128: 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 22887 "configure"
+#line 24134 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22900,20 +24147,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24150: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22906: \$? = $ac_status" >&5
+  echo "$as_me:24153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22912: \$? = $ac_status" >&5
+  echo "$as_me:24159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 22916 "configure"
+#line 24163 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -22929,16 +24176,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24179: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22935: \$? = $ac_status" >&5
+  echo "$as_me:24182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22941: \$? = $ac_status" >&5
+  echo "$as_me:24188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -22959,11 +24206,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:22962: result: yes" >&5
+  echo "$as_me:24209: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:22966: result: no" >&5
+  echo "$as_me:24213: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -22975,14 +24222,14 @@ EOF
 fi
 done
 
-echo "$as_me:22978: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:24225: 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 22985 "configure"
+#line 24232 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -22996,16 +24243,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24246: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23002: \$? = $ac_status" >&5
+  echo "$as_me:24249: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23008: \$? = $ac_status" >&5
+  echo "$as_me:24255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -23016,7 +24263,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:23019: result: $cf_cv_bool_defs" >&5
+echo "$as_me:24266: 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
@@ -23029,14 +24276,14 @@ EOF
 
 fi
 
-echo "$as_me:23032: checking if external errno is declared" >&5
+echo "$as_me:24279: 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 23039 "configure"
+#line 24286 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -23048,22 +24295,22 @@ else
 int
 main ()
 {
-long x = (long) errno
+int x = (int) errno
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23057: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23060: \$? = $ac_status" >&5
+  echo "$as_me:24307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23066: \$? = $ac_status" >&5
+  echo "$as_me:24313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -23074,7 +24321,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23077: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:24324: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -23089,14 +24336,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:23092: checking if external errno exists" >&5
+echo "$as_me:24339: 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 23099 "configure"
+#line 24346 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -23111,16 +24358,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23117: \$? = $ac_status" >&5
+  echo "$as_me:24364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23123: \$? = $ac_status" >&5
+  echo "$as_me:24370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -23131,7 +24378,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23134: result: $cf_cv_have_errno" >&5
+echo "$as_me:24381: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -23144,7 +24391,7 @@ EOF
 
 fi
 
-echo "$as_me:23147: checking if we can set errno" >&5
+echo "$as_me:24394: 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
@@ -23152,7 +24399,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23155 "configure"
+#line 24402 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -23164,16 +24411,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23167: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23170: \$? = $ac_status" >&5
+  echo "$as_me:24417: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23176: \$? = $ac_status" >&5
+  echo "$as_me:24423: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -23184,7 +24431,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23187 "configure"
+#line 24434 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -23195,15 +24442,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23201: \$? = $ac_status" >&5
+  echo "$as_me:24448: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23206: \$? = $ac_status" >&5
+  echo "$as_me:24453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -23216,20 +24463,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:23219: result: $cf_cv_set_errno" >&5
+echo "$as_me:24466: 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:23225: checking for setlocale()" >&5
+echo "$as_me:24472: 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 23232 "configure"
+#line 24479 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -23241,16 +24488,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23244: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23247: \$? = $ac_status" >&5
+  echo "$as_me:24494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23253: \$? = $ac_status" >&5
+  echo "$as_me:24500: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -23262,21 +24509,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23265: result: $cf_cv_locale" >&5
+echo "$as_me:24512: 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:23272: checking if NGROUPS is defined" >&5
+echo "$as_me:24519: 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 23279 "configure"
+#line 24526 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -23295,23 +24542,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23298: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23301: \$? = $ac_status" >&5
+  echo "$as_me:24548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23307: \$? = $ac_status" >&5
+  echo "$as_me:24554: \$? = $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 23314 "configure"
+#line 24561 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -23330,16 +24577,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23336: \$? = $ac_status" >&5
+  echo "$as_me:24583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23342: \$? = $ac_status" >&5
+  echo "$as_me:24589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -23351,7 +24598,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:23354: result: $cf_cv_ngroups" >&5
+echo "$as_me:24601: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -23368,14 +24615,14 @@ EOF
 
 fi
 
-echo "$as_me:23371: checking if external sys_nerr is declared" >&5
+echo "$as_me:24618: 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 23378 "configure"
+#line 24625 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -23387,22 +24634,22 @@ else
 int
 main ()
 {
-long x = (long) sys_nerr
+int x = (int) sys_nerr
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23396: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24643: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23399: \$? = $ac_status" >&5
+  echo "$as_me:24646: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24649: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23405: \$? = $ac_status" >&5
+  echo "$as_me:24652: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -23413,7 +24660,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23416: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:24663: 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
@@ -23428,14 +24675,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:23431: checking if external sys_nerr exists" >&5
+echo "$as_me:24678: 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 23438 "configure"
+#line 24685 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -23450,16 +24697,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23453: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23456: \$? = $ac_status" >&5
+  echo "$as_me:24703: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23462: \$? = $ac_status" >&5
+  echo "$as_me:24709: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -23470,7 +24717,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23473: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:24720: 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
@@ -23483,14 +24730,14 @@ EOF
 
 fi
 
-echo "$as_me:23486: checking if external sys_errlist is declared" >&5
+echo "$as_me:24733: 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 23493 "configure"
+#line 24740 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -23502,22 +24749,22 @@ else
 int
 main ()
 {
-long x = (long) sys_errlist
+int x = (int) sys_errlist
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23514: \$? = $ac_status" >&5
+  echo "$as_me:24761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23520: \$? = $ac_status" >&5
+  echo "$as_me:24767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -23528,7 +24775,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23531: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:24778: 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
@@ -23543,14 +24790,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:23546: checking if external sys_errlist exists" >&5
+echo "$as_me:24793: 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 23553 "configure"
+#line 24800 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -23565,16 +24812,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23568: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23571: \$? = $ac_status" >&5
+  echo "$as_me:24818: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23577: \$? = $ac_status" >&5
+  echo "$as_me:24824: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -23585,7 +24832,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23588: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:24835: 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
@@ -23601,23 +24848,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:23604: checking for $ac_header" >&5
+echo "$as_me:24851: 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 23610 "configure"
+#line 24857 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23614: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24861: \"$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:23620: \$? = $ac_status" >&5
+  echo "$as_me:24867: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23636,7 +24883,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:23639: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24886: 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
@@ -23646,14 +24893,14 @@ EOF
 fi
 done
 
-echo "$as_me:23649: checking for lastlog path" >&5
+echo "$as_me:24896: 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 23656 "configure"
+#line 24903 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -23673,16 +24920,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23679: \$? = $ac_status" >&5
+  echo "$as_me:24926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23685: \$? = $ac_status" >&5
+  echo "$as_me:24932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -23697,13 +24944,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:23700: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:24947: 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:23706: checking for utmp implementation" >&5
+echo "$as_me:24953: 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
@@ -23720,7 +24967,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23723 "configure"
+#line 24970 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -23734,16 +24981,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23737: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23740: \$? = $ac_status" >&5
+  echo "$as_me:24987: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23746: \$? = $ac_status" >&5
+  echo "$as_me:24993: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -23752,7 +24999,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23755 "configure"
+#line 25002 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -23766,16 +25013,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25016: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23772: \$? = $ac_status" >&5
+  echo "$as_me:25019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23778: \$? = $ac_status" >&5
+  echo "$as_me:25025: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -23790,7 +25037,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:23793: result: $cf_cv_have_utmp" >&5
+echo "$as_me:25040: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -23803,14 +25050,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:23806: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:25053: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_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 23813 "configure"
+#line 25060 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -23824,16 +25071,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25074: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23830: \$? = $ac_status" >&5
+  echo "$as_me:25077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23836: \$? = $ac_status" >&5
+  echo "$as_me:25083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -23845,7 +25092,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23848: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:25095: 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
@@ -23854,14 +25101,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:23857: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:25104: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_utmp}.ut_syslen is declared... $ECHO_C" >&6
 if test "${cf_cv_have_utmp_ut_syslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23864 "configure"
+#line 25111 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -23875,16 +25122,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25125: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23881: \$? = $ac_status" >&5
+  echo "$as_me:25128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23887: \$? = $ac_status" >&5
+  echo "$as_me:25134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -23896,7 +25143,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23899: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:25146: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test $cf_cv_have_utmp_ut_syslen != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_SYSLEN 1
@@ -23905,7 +25152,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:23908: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:25155: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_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
@@ -23922,7 +25169,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23925 "configure"
+#line 25172 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -23936,16 +25183,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23939: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25186: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23942: \$? = $ac_status" >&5
+  echo "$as_me:25189: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23948: \$? = $ac_status" >&5
+  echo "$as_me:25195: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -23957,12 +25204,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:23960: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:25207: 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:23965: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:25212: 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; }; }
 	;;
@@ -23976,7 +25223,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:23979: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:25226: 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
@@ -23989,7 +25236,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 23992 "configure"
+#line 25239 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24003,16 +25250,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24006: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24009: \$? = $ac_status" >&5
+  echo "$as_me:25256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24015: \$? = $ac_status" >&5
+  echo "$as_me:25262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -24025,7 +25272,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:24028: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:25275: 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
@@ -24040,14 +25287,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:24043: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:25290: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_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 24050 "configure"
+#line 25297 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24061,23 +25308,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24064: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25311: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24067: \$? = $ac_status" >&5
+  echo "$as_me:25314: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24073: \$? = $ac_status" >&5
+  echo "$as_me:25320: \$? = $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 24080 "configure"
+#line 25327 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24091,16 +25338,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:24094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24097: \$? = $ac_status" >&5
+  echo "$as_me:25344: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24103: \$? = $ac_status" >&5
+  echo "$as_me:25350: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -24114,7 +25361,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24117: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:25364: 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
@@ -24131,14 +25378,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:24134: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:25381: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
 echo $ECHO_N "checking if ${cf_cv_have_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 24141 "configure"
+#line 25388 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24152,16 +25399,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24158: \$? = $ac_status" >&5
+  echo "$as_me:25405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24164: \$? = $ac_status" >&5
+  echo "$as_me:25411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -24172,7 +25419,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24175: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:25422: 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
@@ -24182,7 +25429,7 @@ EOF
 fi
 fi
 
-echo "$as_me:24185: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:25432: 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
@@ -24190,7 +25437,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24193 "configure"
+#line 25440 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24209,16 +25456,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24212: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24215: \$? = $ac_status" >&5
+  echo "$as_me:25462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24221: \$? = $ac_status" >&5
+  echo "$as_me:25468: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -24229,7 +25476,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24232: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:25479: 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
@@ -24237,14 +25484,14 @@ EOF
 
 fi
 
-echo "$as_me:24240: checking if external h_errno exists" >&5
+echo "$as_me:25487: 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 24247 "configure"
+#line 25494 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -24259,16 +25506,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25509: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24265: \$? = $ac_status" >&5
+  echo "$as_me:25512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24271: \$? = $ac_status" >&5
+  echo "$as_me:25518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -24279,7 +25526,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24282: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:25529: 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
@@ -24292,7 +25539,7 @@ EOF
 
 fi
 
-echo "$as_me:24295: checking if bibp: URLs should be supported" >&5
+echo "$as_me:25542: 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.
@@ -24309,13 +25556,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:24312: result: $use_bibp_urls" >&5
+echo "$as_me:25559: 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:24318: checking if configuration info should be browsable" >&5
+echo "$as_me:25565: 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.
@@ -24332,13 +25579,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:24335: result: $use_config_info" >&5
+echo "$as_me:25582: 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:24341: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:25588: 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.
@@ -24355,13 +25602,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:24358: result: $use_forms_options" >&5
+echo "$as_me:25605: 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:24364: checking if old-style options menu should be used" >&5
+echo "$as_me:25611: 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.
@@ -24378,13 +25625,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:24381: result: $use_menu_options" >&5
+echo "$as_me:25628: 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:24387: checking if experimental address-list page should be used" >&5
+echo "$as_me:25634: 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.
@@ -24401,13 +25648,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:24404: result: $use_addrlist_page" >&5
+echo "$as_me:25651: 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:24410: checking if experimental charset-selection logic should be used" >&5
+echo "$as_me:25657: 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.
@@ -24424,13 +25671,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:24427: result: $use_charset_choice" >&5
+echo "$as_me:25674: 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:24433: checking if experimental CJK logic should be used" >&5
+echo "$as_me:25680: 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.
@@ -24447,13 +25694,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:24450: result: $use_cjk" >&5
+echo "$as_me:25697: 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:24456: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:25703: 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.
@@ -24470,7 +25717,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:24473: result: $use_ja_utf8" >&5
+echo "$as_me:25720: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -24515,7 +25762,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24518 "configure"
+#line 25765 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24527,16 +25774,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25777: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24533: \$? = $ac_status" >&5
+  echo "$as_me:25780: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24539: \$? = $ac_status" >&5
+  echo "$as_me:25786: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24553,7 +25800,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:24556: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:25803: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -24594,7 +25841,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24597 "configure"
+#line 25844 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24606,16 +25853,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24609: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24612: \$? = $ac_status" >&5
+  echo "$as_me:25859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24618: \$? = $ac_status" >&5
+  echo "$as_me:25865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24632,7 +25879,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:24635: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:25882: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -24648,7 +25895,7 @@ echo "${as_me-configure}:24635: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:24651: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:25898: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -24673,7 +25920,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:24676: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:25923: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -24702,7 +25949,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:24705: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:25952: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -24711,7 +25958,7 @@ echo "${as_me-configure}:24705: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:24714: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:25961: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -24722,7 +25969,7 @@ done
 
 fi;
 
-  echo "$as_me:24725: checking for iconv" >&5
+  echo "$as_me:25972: 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
@@ -24733,10 +25980,10 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:24736: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:25983: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24739 "configure"
+#line 25986 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -24755,16 +26002,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24761: \$? = $ac_status" >&5
+  echo "$as_me:26008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24767: \$? = $ac_status" >&5
+  echo "$as_me:26014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_iconv=yes
 else
@@ -24773,12 +26020,37 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_iconv=no
 
-echo "${as_me-configure}:24776: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:26023: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
-    cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/iconv &&       cf_search="$cf_search $cf_header_path/include/iconv"
+	test -d $cf_header_path/include/iconv/include &&    cf_search="$cf_search $cf_header_path/include/iconv/include"
+	test -d $cf_header_path/iconv/include &&       cf_search="$cf_search $cf_header_path/iconv/include"
+	test -d $cf_header_path/iconv/include/iconv &&    cf_search="$cf_search $cf_header_path/iconv/include/iconv"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -24849,16 +26121,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/iconv && cf_search="$cf_search $oldincludedir/iconv"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
     for cf_cv_header_path_iconv in $cf_search
     do
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:24857: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:26131: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
         cat >conftest.$ac_ext <<_ACEOF
-#line 24861 "configure"
+#line 26135 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -24877,21 +26151,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24880: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26154: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24883: \$? = $ac_status" >&5
+  echo "$as_me:26157: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24889: \$? = $ac_status" >&5
+  echo "$as_me:26163: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found iconv headers in $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:24894: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:26168: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -24909,13 +26183,39 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:24912: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:26186: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
 
       if test "$cf_cv_find_linkage_iconv" != yes ; then
-        cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/iconv &&       cf_search="$cf_search $cf_library_path/lib/iconv"
+	test -d $cf_library_path/lib/iconv/lib &&    cf_search="$cf_search $cf_library_path/lib/iconv/lib"
+	test -d $cf_library_path/iconv/lib &&       cf_search="$cf_search $cf_library_path/iconv/lib"
+	test -d $cf_library_path/iconv/lib/iconv &&    cf_search="$cf_search $cf_library_path/iconv/lib/iconv"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -24972,18 +26272,20 @@ test -d "$HOME" && \
 	test -d $HOME/iconv/lib/iconv &&    cf_search="$cf_search $HOME/iconv/lib/iconv"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
         for cf_cv_library_path_iconv in $cf_search
         do
           if test -d $cf_cv_library_path_iconv ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:24980: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:26282: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-liconv  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv"
             cat >conftest.$ac_ext <<_ACEOF
-#line 24986 "configure"
+#line 26288 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -25002,21 +26304,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25008: \$? = $ac_status" >&5
+  echo "$as_me:26310: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25014: \$? = $ac_status" >&5
+  echo "$as_me:26316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found iconv library in $cf_cv_library_path_iconv" 1>&6
 
-echo "${as_me-configure}:25019: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:26321: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -25052,7 +26354,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:25055: result: $am_cv_func_iconv" >&5
+echo "$as_me:26357: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -25061,14 +26363,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:25064: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:26366: checking if the declaration of iconv() needs const." >&5
 echo $ECHO_N "checking if the declaration of iconv() needs const.... $ECHO_C" >&6
 if test "${am_cv_proto_iconv_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
       cat >conftest.$ac_ext <<_ACEOF
-#line 25071 "configure"
+#line 26373 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -25093,16 +26395,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25099: \$? = $ac_status" >&5
+  echo "$as_me:26401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25105: \$? = $ac_status" >&5
+  echo "$as_me:26407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -25112,7 +26414,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25115: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:26417: result: $am_cv_proto_iconv_const" >&5
 echo "${ECHO_T}$am_cv_proto_iconv_const" >&6
 
     if test "$am_cv_proto_iconv_const" = yes ; then
@@ -25154,7 +26456,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 25157 "configure"
+#line 26459 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25166,16 +26468,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26471: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25172: \$? = $ac_status" >&5
+  echo "$as_me:26474: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25178: \$? = $ac_status" >&5
+  echo "$as_me:26480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -25192,7 +26494,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:25195: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26497: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -25229,7 +26531,7 @@ if test -n "$cf_cv_library_path_iconv" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:25232: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26534: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -25253,7 +26555,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:25256: checking if you want to use default-colors" >&5
+echo "$as_me:26558: 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.
@@ -25270,7 +26572,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:25273: result: $use_dft_colors" >&5
+echo "$as_me:26575: 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
@@ -25278,7 +26580,7 @@ EOF
 
 fi
 
-echo "$as_me:25281: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:26583: 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.
@@ -25295,13 +26597,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:25298: result: $use_kbd_layout" >&5
+echo "$as_me:26600: 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:25304: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:26606: 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.
@@ -25318,13 +26620,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:25321: result: $use_nested_tables" >&5
+echo "$as_me:26623: 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:25327: checking if progress-bar code should be used" >&5
+echo "$as_me:26629: checking if progress-bar code should be used" >&5
 echo $ECHO_N "checking if progress-bar code should be used... $ECHO_C" >&6
 
 # Check whether --enable-progressbar or --disable-progressbar was given.
@@ -25341,13 +26643,13 @@ else
   use_progressbar=no
 
 fi;
-echo "$as_me:25344: result: $use_progressbar" >&5
+echo "$as_me:26646: result: $use_progressbar" >&5
 echo "${ECHO_T}$use_progressbar" >&6
 test $use_progressbar != no && cat >>confdefs.h <<\EOF
 #define USE_PROGRESSBAR 1
 EOF
 
-echo "$as_me:25350: checking if scrollbar code should be used" >&5
+echo "$as_me:26652: 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.
@@ -25364,10 +26666,10 @@ else
   use_scrollbar=no
 
 fi;
-echo "$as_me:25367: result: $use_scrollbar" >&5
+echo "$as_me:26669: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:25370: checking if sessions code should be used" >&5
+echo "$as_me:26672: checking if sessions code should be used" >&5
 echo $ECHO_N "checking if sessions code should be used... $ECHO_C" >&6
 
 # Check whether --enable-sessions or --disable-sessions was given.
@@ -25384,7 +26686,7 @@ else
   use_sessions=no
 
 fi;
-echo "$as_me:25387: result: $use_sessions" >&5
+echo "$as_me:26689: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
     cat >>confdefs.h <<\EOF
@@ -25394,7 +26696,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:25397: checking if session-caching code should be used" >&5
+echo "$as_me:26699: checking if session-caching code should be used" >&5
 echo $ECHO_N "checking if session-caching code should be used... $ECHO_C" >&6
 
 # Check whether --enable-session-cache or --disable-session-cache was given.
@@ -25411,7 +26713,7 @@ else
   use_session_cache=no
 
 fi;
-echo "$as_me:25414: result: $use_session_cache" >&5
+echo "$as_me:26716: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -25420,7 +26722,7 @@ EOF
 
 fi
 
-echo "$as_me:25423: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:26725: 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.
@@ -25437,13 +26739,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:25440: result: $use_alt_bindings" >&5
+echo "$as_me:26742: 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:25446: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:26748: 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.
@@ -25460,13 +26762,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:25463: result: $use_ext_htmldtd" >&5
+echo "$as_me:26765: 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:25469: checking if file-upload logic should be used" >&5
+echo "$as_me:26771: 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.
@@ -25483,13 +26785,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:25486: result: $use_file_upload" >&5
+echo "$as_me:26788: 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:25492: checking if element-justification logic should be used" >&5
+echo "$as_me:26794: checking if element-justification logic should be used" >&5
 echo $ECHO_N "checking if element-justification logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-justify-elts or --disable-justify-elts was given.
@@ -25506,13 +26808,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:25509: result: $use_justify_elts" >&5
+echo "$as_me:26811: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no && cat >>confdefs.h <<\EOF
 #define EXP_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:25515: checking if partial-display should be used" >&5
+echo "$as_me:26817: 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.
@@ -25529,13 +26831,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:25532: result: $use_partial_display" >&5
+echo "$as_me:26834: 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:25538: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:26840: 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.
@@ -25552,13 +26854,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:25555: result: $use_filed_cookies" >&5
+echo "$as_me:26857: 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:25561: checking if html source should be colorized" >&5
+echo "$as_me:26863: 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.
@@ -25575,13 +26877,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:25578: result: $use_prettysrc" >&5
+echo "$as_me:26880: 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:25584: checking if read-progress message should show ETA" >&5
+echo "$as_me:26886: 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.
@@ -25598,13 +26900,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:25601: result: $use_read_eta" >&5
+echo "$as_me:26903: 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:25607: checking if source caching should be used" >&5
+echo "$as_me:26909: 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.
@@ -25621,13 +26923,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:25624: result: $use_source_cache" >&5
+echo "$as_me:26926: 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:25630: checking if you want to use external commands" >&5
+echo "$as_me:26932: 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.
@@ -25644,7 +26946,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:25647: result: $use_externs" >&5
+echo "$as_me:26949: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -25654,7 +26956,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:25657: checking if you want to use setfont support" >&5
+echo "$as_me:26959: 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.
@@ -25671,7 +26973,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:25674: result: $use_setfont" >&5
+echo "$as_me:26976: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -25682,7 +26984,7 @@ for ac_prog in $SETFONT consolechars setfont
 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:25685: checking for $ac_word" >&5
+echo "$as_me:26987: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_SETFONT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -25699,7 +27001,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_SETFONT="$ac_dir/$ac_word"
-   echo "$as_me:25702: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27004: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -25710,10 +27012,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:25713: result: $SETFONT" >&5
+  echo "$as_me:27015: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:25716: result: no" >&5
+  echo "$as_me:27018: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25781,7 +27083,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:25784: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27086: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -25798,19 +27100,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me-configure}:25801: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me-configure}:27103: testing Assume $host_os has font-switching ..." 1>&5
 
 		;;
 	*)
 		SETFONT=unknown
 		test -n "$verbose" && echo "	Assume $host_os has no font-switching" 1>&6
 
-echo "${as_me-configure}:25808: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me-configure}:27110: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:25813: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:27115: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 		cat >>confdefs.h <<\EOF
@@ -25820,7 +27122,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25823: checking if you want cgi-link support" >&5
+echo "$as_me:27125: 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.
@@ -25836,10 +27138,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:25839: result: $enableval" >&5
+echo "$as_me:27141: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:25842: checking if you want change-exec support" >&5
+echo "$as_me:27144: 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.
@@ -25856,13 +27158,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:25859: result: $use_change_exec" >&5
+echo "$as_me:27161: 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:25865: checking if you want exec-links support" >&5
+echo "$as_me:27167: 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.
@@ -25879,13 +27181,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:25882: result: $use_exec_links" >&5
+echo "$as_me:27184: 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:25888: checking if you want exec-scripts support" >&5
+echo "$as_me:27190: 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.
@@ -25902,13 +27204,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:25905: result: $use_exec_scripts" >&5
+echo "$as_me:27207: 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:25911: checking if you want internal-links feature" >&5
+echo "$as_me:27213: 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.
@@ -25925,13 +27227,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:25928: result: $use_internal_links" >&5
+echo "$as_me:27230: 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:25934: checking if you want to fork NSL requests" >&5
+echo "$as_me:27236: 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.
@@ -25948,13 +27250,13 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:25951: result: $use_nsl_fork" >&5
+echo "$as_me:27253: 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:25957: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:27259: 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.
@@ -25971,13 +27273,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:25974: result: $use_syslog" >&5
+echo "$as_me:27276: 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:25980: checking if you want to underline links" >&5
+echo "$as_me:27282: 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.
@@ -25994,7 +27296,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:25997: result: $use_underline" >&5
+echo "$as_me:27299: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -26004,7 +27306,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:26007: checking if help files should be gzip'ed" >&5
+echo "$as_me:27309: 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.
@@ -26021,10 +27323,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:26024: result: $use_gzip_help" >&5
+echo "$as_me:27326: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:26027: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:27329: 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.
@@ -26034,7 +27336,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:26037: result: $use_bzlib" >&5
+echo "$as_me:27339: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -26073,7 +27375,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26076 "configure"
+#line 27378 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26085,16 +27387,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26088: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27390: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26091: \$? = $ac_status" >&5
+  echo "$as_me:27393: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26097: \$? = $ac_status" >&5
+  echo "$as_me:27399: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26111,7 +27413,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:26114: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:27416: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26152,7 +27454,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26155 "configure"
+#line 27457 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26164,16 +27466,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26167: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26170: \$? = $ac_status" >&5
+  echo "$as_me:27472: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26176: \$? = $ac_status" >&5
+  echo "$as_me:27478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26190,7 +27492,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:26193: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:27495: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26206,7 +27508,7 @@ echo "${as_me-configure}:26193: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:26209: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:27511: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26231,7 +27533,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:26234: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:27536: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26260,7 +27562,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:26263: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:27565: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26269,7 +27571,7 @@ echo "${as_me-configure}:26263: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:26272: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:27574: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26283,10 +27585,10 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me-configure}:26286: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:27588: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 26289 "configure"
+#line 27591 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26303,16 +27605,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26309: \$? = $ac_status" >&5
+  echo "$as_me:27611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26315: \$? = $ac_status" >&5
+  echo "$as_me:27617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_bz2=yes
 else
@@ -26321,12 +27623,37 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_bz2=no
 
-echo "${as_me-configure}:26324: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:27626: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
-    cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/bzlib &&       cf_search="$cf_search $cf_header_path/include/bzlib"
+	test -d $cf_header_path/include/bzlib/include &&    cf_search="$cf_search $cf_header_path/include/bzlib/include"
+	test -d $cf_header_path/bzlib/include &&       cf_search="$cf_search $cf_header_path/bzlib/include"
+	test -d $cf_header_path/bzlib/include/bzlib &&    cf_search="$cf_search $cf_header_path/bzlib/include/bzlib"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -26397,16 +27724,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/bzlib && cf_search="$cf_search $oldincludedir/bzlib"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
     for cf_cv_header_path_bz2 in $cf_search
     do
       if test -d $cf_cv_header_path_bz2 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:26405: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:27734: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
         cat >conftest.$ac_ext <<_ACEOF
-#line 26409 "configure"
+#line 27738 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26423,21 +27752,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27755: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26429: \$? = $ac_status" >&5
+  echo "$as_me:27758: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26435: \$? = $ac_status" >&5
+  echo "$as_me:27764: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 headers in $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:26440: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:27769: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -26455,7 +27784,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me-configure}:26458: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:27787: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -26463,7 +27792,7 @@ echo "${as_me-configure}:26458: testing Searching for bz2 library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 26466 "configure"
+#line 27795 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26480,21 +27809,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27812: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26486: \$? = $ac_status" >&5
+  echo "$as_me:27815: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26492: \$? = $ac_status" >&5
+  echo "$as_me:27821: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me-configure}:26497: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me-configure}:27826: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -26506,7 +27835,33 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
             LIBS="$cf_save_LIBS"
 
       if test "$cf_cv_find_linkage_bz2" != yes ; then
-        cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/bz2 &&       cf_search="$cf_search $cf_library_path/lib/bz2"
+	test -d $cf_library_path/lib/bz2/lib &&    cf_search="$cf_search $cf_library_path/lib/bz2/lib"
+	test -d $cf_library_path/bz2/lib &&       cf_search="$cf_search $cf_library_path/bz2/lib"
+	test -d $cf_library_path/bz2/lib/bz2 &&    cf_search="$cf_search $cf_library_path/bz2/lib/bz2"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -26563,18 +27918,20 @@ test -d "$HOME" && \
 	test -d $HOME/bz2/lib/bz2 &&    cf_search="$cf_search $HOME/bz2/lib/bz2"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
         for cf_cv_library_path_bz2 in $cf_search
         do
           if test -d $cf_cv_library_path_bz2 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me-configure}:26571: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:27928: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lbz2  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_bz2"
             cat >conftest.$ac_ext <<_ACEOF
-#line 26577 "configure"
+#line 27934 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -26591,21 +27948,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26597: \$? = $ac_status" >&5
+  echo "$as_me:27954: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26603: \$? = $ac_status" >&5
+  echo "$as_me:27960: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found bz2 library in $cf_cv_library_path_bz2" 1>&6
 
-echo "${as_me-configure}:26608: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:27965: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -26660,7 +28017,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26663 "configure"
+#line 28020 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26672,16 +28029,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26675: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28032: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26678: \$? = $ac_status" >&5
+  echo "$as_me:28035: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26684: \$? = $ac_status" >&5
+  echo "$as_me:28041: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26698,7 +28055,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:26701: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28058: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26732,7 +28089,7 @@ if test -n "$cf_cv_library_path_bz2" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:26735: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28092: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26743,7 +28100,7 @@ fi
   LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:26746: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:28103: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -26753,7 +28110,7 @@ EOF
 
 fi
 
-echo "$as_me:26756: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:28113: 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.
@@ -26763,7 +28120,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:26766: result: $use_zlib" >&5
+echo "$as_me:28123: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -26802,7 +28159,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26805 "configure"
+#line 28162 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26814,16 +28171,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26820: \$? = $ac_status" >&5
+  echo "$as_me:28177: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26826: \$? = $ac_status" >&5
+  echo "$as_me:28183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26840,7 +28197,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:26843: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28200: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26881,7 +28238,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26884 "configure"
+#line 28241 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26893,16 +28250,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26896: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26899: \$? = $ac_status" >&5
+  echo "$as_me:28256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26905: \$? = $ac_status" >&5
+  echo "$as_me:28262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26919,7 +28276,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:26922: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28279: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26935,7 +28292,7 @@ echo "${as_me-configure}:26922: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:26938: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:28295: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26960,7 +28317,7 @@ if test -n "$cf_searchpath/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:26963: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28320: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26989,7 +28346,7 @@ if test -n "$cf_searchpath" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:26992: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28349: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26998,7 +28355,7 @@ echo "${as_me-configure}:26992: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:27001: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:28358: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -27012,10 +28369,10 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me-configure}:27015: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:28372: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27018 "configure"
+#line 28375 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -27031,16 +28388,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28391: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27037: \$? = $ac_status" >&5
+  echo "$as_me:28394: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27043: \$? = $ac_status" >&5
+  echo "$as_me:28400: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_z=yes
 else
@@ -27049,12 +28406,37 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_z=no
 
-echo "${as_me-configure}:27052: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:28409: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
 
-    cf_search=""
+cf_header_path_list=""
+if test -n "${CFLAGS}${CPPFLAGS}" ; then
+	for cf_header_path in $CPPFLAGS $CFLAGS
+	do
+		case $cf_header_path in #(vi
+		-I*)
+			cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'`
+
+test "$cf_header_path" != "NONE" && \
+test -d "$cf_header_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for include-directories under $cf_header_path"
+	test -d $cf_header_path/include &&          cf_search="$cf_search $cf_header_path/include"
+	test -d $cf_header_path/include/zlib &&       cf_search="$cf_search $cf_header_path/include/zlib"
+	test -d $cf_header_path/include/zlib/include &&    cf_search="$cf_search $cf_header_path/include/zlib/include"
+	test -d $cf_header_path/zlib/include &&       cf_search="$cf_search $cf_header_path/zlib/include"
+	test -d $cf_header_path/zlib/include/zlib &&    cf_search="$cf_search $cf_header_path/zlib/include/zlib"
+}
+
+			cf_header_path_list="$cf_header_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -27125,16 +28507,18 @@ test -d "$oldincludedir" && {
 	test -d $oldincludedir/zlib && cf_search="$cf_search $oldincludedir/zlib"
 }
 
+cf_search="$cf_header_path_list $cf_search"
+
     for cf_cv_header_path_z in $cf_search
     do
       if test -d $cf_cv_header_path_z ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:27133: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:28517: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
         cat >conftest.$ac_ext <<_ACEOF
-#line 27137 "configure"
+#line 28521 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -27150,21 +28534,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27156: \$? = $ac_status" >&5
+  echo "$as_me:28540: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27162: \$? = $ac_status" >&5
+  echo "$as_me:28546: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z headers in $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:27167: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:28551: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -27182,7 +28566,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me-configure}:27185: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:28569: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -27190,7 +28574,7 @@ echo "${as_me-configure}:27185: testing Searching for z library in FIND_LINKAGE(
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 27193 "configure"
+#line 28577 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -27206,21 +28590,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28593: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27212: \$? = $ac_status" >&5
+  echo "$as_me:28596: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27218: \$? = $ac_status" >&5
+  echo "$as_me:28602: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me-configure}:27223: testing ... found z library in system ..." 1>&5
+echo "${as_me-configure}:28607: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -27232,7 +28616,33 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
             LIBS="$cf_save_LIBS"
 
       if test "$cf_cv_find_linkage_z" != yes ; then
-        cf_search=""
+
+cf_library_path_list=""
+if test -n "${LDFLAGS}${LIBS}" ; then
+	for cf_library_path in $LDFLAGS $LIBS
+	do
+		case $cf_library_path in #(vi
+		-L*)
+			cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'`
+
+test "$cf_library_path" != "NONE" && \
+test -d "$cf_library_path" && \
+ {
+	test -n "$verbose" && echo "	... testing for lib-directories under $cf_library_path"
+	test -d $cf_library_path/lib &&          cf_search="$cf_search $cf_library_path/lib"
+	test -d $cf_library_path/lib/z &&       cf_search="$cf_search $cf_library_path/lib/z"
+	test -d $cf_library_path/lib/z/lib &&    cf_search="$cf_search $cf_library_path/lib/z/lib"
+	test -d $cf_library_path/z/lib &&       cf_search="$cf_search $cf_library_path/z/lib"
+	test -d $cf_library_path/z/lib/z &&    cf_search="$cf_search $cf_library_path/z/lib/z"
+}
+
+			cf_library_path_list="$cf_library_path_list $cf_search"
+			;;
+		esac
+	done
+fi
+
+cf_search=""
 
 test "/usr" != "$prefix" && \
 test -d "/usr" && \
@@ -27289,18 +28699,20 @@ test -d "$HOME" && \
 	test -d $HOME/z/lib/z &&    cf_search="$cf_search $HOME/z/lib/z"
 }
 
+cf_search="$cf_library_path_list $cf_search"
+
         for cf_cv_library_path_z in $cf_search
         do
           if test -d $cf_cv_library_path_z ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_z" 1>&6
 
-echo "${as_me-configure}:27297: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:28709: testing ... testing $cf_cv_library_path_z ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lz  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_z"
             cat >conftest.$ac_ext <<_ACEOF
-#line 27303 "configure"
+#line 28715 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -27316,21 +28728,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27322: \$? = $ac_status" >&5
+  echo "$as_me:28734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27328: \$? = $ac_status" >&5
+  echo "$as_me:28740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found z library in $cf_cv_library_path_z" 1>&6
 
-echo "${as_me-configure}:27333: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:28745: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -27385,7 +28797,7 @@ if test -n "$cf_cv_header_path_z" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 27388 "configure"
+#line 28800 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27397,16 +28809,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27400: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28812: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27403: \$? = $ac_status" >&5
+  echo "$as_me:28815: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27409: \$? = $ac_status" >&5
+  echo "$as_me:28821: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27423,7 +28835,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		if test "$cf_have_incdir" = no ; then
 		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
 
-echo "${as_me-configure}:27426: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28838: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -27457,7 +28869,7 @@ if test -n "$cf_cv_library_path_z" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:27460: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28872: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -27468,7 +28880,7 @@ fi
   LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:27471: WARNING: Cannot find z library" >&5
+{ echo "$as_me:28883: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -27478,7 +28890,7 @@ EOF
 
 fi
 
-echo "$as_me:27481: checking if you want to exclude FINGER code" >&5
+echo "$as_me:28893: 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.
@@ -27495,13 +28907,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:27498: result: $use_finger" >&5
+echo "$as_me:28910: 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:27504: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:28916: 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.
@@ -27518,13 +28930,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:27521: result: $use_gopher" >&5
+echo "$as_me:28933: 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:27527: checking if you want to exclude NEWS code" >&5
+echo "$as_me:28939: 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.
@@ -27541,13 +28953,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:27544: result: $use_news" >&5
+echo "$as_me:28956: 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:27550: checking if you want to exclude FTP code" >&5
+echo "$as_me:28962: 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.
@@ -27564,7 +28976,7 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:27567: result: $use_ftp" >&5
+echo "$as_me:28979: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
@@ -27572,7 +28984,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:27575: checking if directory-editor code should be used" >&5
+echo "$as_me:28987: 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.
@@ -27589,7 +29001,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:27592: result: $use_dired" >&5
+echo "$as_me:29004: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -27598,7 +29010,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:27601: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:29013: 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.
@@ -27614,10 +29026,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:27617: result: $enableval" >&5
+	echo "$as_me:29029: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27620: checking if DirEd mode should override keys" >&5
+	echo "$as_me:29032: 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.
@@ -27639,10 +29051,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27642: result: $enableval" >&5
+	echo "$as_me:29054: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27645: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:29057: 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.
@@ -27664,10 +29076,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27667: result: $enableval" >&5
+	echo "$as_me:29079: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27670: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:29082: 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.
@@ -27683,10 +29095,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:27686: result: $enableval" >&5
+	echo "$as_me:29098: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27689: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:29101: 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.
@@ -27708,10 +29120,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27711: result: $enableval" >&5
+	echo "$as_me:29123: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27714: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:29126: 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.
@@ -27733,10 +29145,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27736: result: $enableval" >&5
+	echo "$as_me:29148: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27739: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:29151: 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.
@@ -27758,10 +29170,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:27761: result: $enableval" >&5
+	echo "$as_me:29173: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:27764: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:29176: 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.
@@ -27783,11 +29195,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:27786: result: $enableval" >&5
+	echo "$as_me:29198: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:27790: checking if you want long-directory listings" >&5
+echo "$as_me:29202: 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.
@@ -27809,10 +29221,10 @@ else
 EOF
 
 fi;
-echo "$as_me:27812: result: $enableval" >&5
+echo "$as_me:29224: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:27815: checking if parent-directory references are permitted" >&5
+echo "$as_me:29227: 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.
@@ -27828,7 +29240,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:27831: result: $enableval" >&5
+echo "$as_me:29243: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -27836,7 +29248,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:27839: checking for $ac_word" >&5
+echo "$as_me:29251: 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
@@ -27853,7 +29265,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:27856: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29268: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27864,10 +29276,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:27867: result: $TELNET" >&5
+  echo "$as_me:29279: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:27870: result: no" >&5
+  echo "$as_me:29282: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27935,7 +29347,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:27938: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29350: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -27952,7 +29364,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:27955: checking for $ac_word" >&5
+echo "$as_me:29367: 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
@@ -27969,7 +29381,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:27972: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29384: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27980,10 +29392,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:27983: result: $TN3270" >&5
+  echo "$as_me:29395: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:27986: result: no" >&5
+  echo "$as_me:29398: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28051,7 +29463,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28054: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29466: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -28068,7 +29480,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:28071: checking for $ac_word" >&5
+echo "$as_me:29483: 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
@@ -28085,7 +29497,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:28088: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29500: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28096,10 +29508,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:28099: result: $RLOGIN" >&5
+  echo "$as_me:29511: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:28102: result: no" >&5
+  echo "$as_me:29514: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28167,7 +29579,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28170: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29582: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -28184,7 +29596,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:28187: checking for $ac_word" >&5
+echo "$as_me:29599: 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
@@ -28201,7 +29613,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:28204: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29616: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28212,10 +29624,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:28215: result: $MV" >&5
+  echo "$as_me:29627: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:28218: result: no" >&5
+  echo "$as_me:29630: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28283,7 +29695,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28286: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29698: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -28300,7 +29712,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:28303: checking for $ac_word" >&5
+echo "$as_me:29715: 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
@@ -28317,7 +29729,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:28320: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29732: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28328,10 +29740,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:28331: result: $GZIP" >&5
+  echo "$as_me:29743: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:28334: result: no" >&5
+  echo "$as_me:29746: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28399,7 +29811,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28402: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29814: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -28416,7 +29828,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:28419: checking for $ac_word" >&5
+echo "$as_me:29831: 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
@@ -28433,7 +29845,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:28436: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29848: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28444,10 +29856,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:28447: result: $UNCOMPRESS" >&5
+  echo "$as_me:29859: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:28450: result: no" >&5
+  echo "$as_me:29862: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28515,7 +29927,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28518: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29930: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -28532,7 +29944,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:28535: checking for $ac_word" >&5
+echo "$as_me:29947: 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
@@ -28549,7 +29961,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:28552: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29964: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28560,10 +29972,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:28563: result: $UNZIP" >&5
+  echo "$as_me:29975: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:28566: result: no" >&5
+  echo "$as_me:29978: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28631,7 +30043,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28634: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30046: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -28648,7 +30060,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:28651: checking for $ac_word" >&5
+echo "$as_me:30063: 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
@@ -28665,7 +30077,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:28668: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30080: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28676,10 +30088,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:28679: result: $BZIP2" >&5
+  echo "$as_me:30091: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:28682: result: no" >&5
+  echo "$as_me:30094: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28747,7 +30159,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28750: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30162: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -28764,7 +30176,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:28767: checking for $ac_word" >&5
+echo "$as_me:30179: 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
@@ -28781,7 +30193,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:28784: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30196: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28792,10 +30204,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:28795: result: $TAR" >&5
+  echo "$as_me:30207: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:28798: result: no" >&5
+  echo "$as_me:30210: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28863,7 +30275,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28866: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30278: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -28920,7 +30332,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:28923: checking for $ac_word" >&5
+echo "$as_me:30335: 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
@@ -28937,7 +30349,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:28940: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30352: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -28948,10 +30360,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:28951: result: $COMPRESS" >&5
+  echo "$as_me:30363: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:28954: result: no" >&5
+  echo "$as_me:30366: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29019,7 +30431,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29022: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30434: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -29036,7 +30448,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:29039: checking for $ac_word" >&5
+echo "$as_me:30451: 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
@@ -29053,7 +30465,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:29056: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30468: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29064,10 +30476,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:29067: result: $RM" >&5
+  echo "$as_me:30479: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:29070: result: no" >&5
+  echo "$as_me:30482: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29135,7 +30547,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29138: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30550: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -29152,7 +30564,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:29155: checking for $ac_word" >&5
+echo "$as_me:30567: 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
@@ -29169,7 +30581,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:29172: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30584: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29180,10 +30592,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:29183: result: $UUDECODE" >&5
+  echo "$as_me:30595: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:29186: result: no" >&5
+  echo "$as_me:30598: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29251,7 +30663,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29254: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30666: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -29268,7 +30680,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:29271: checking for $ac_word" >&5
+echo "$as_me:30683: 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
@@ -29285,7 +30697,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:29288: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30700: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29296,10 +30708,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:29299: result: $ZCAT" >&5
+  echo "$as_me:30711: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:29302: result: no" >&5
+  echo "$as_me:30714: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29367,7 +30779,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29370: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30782: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -29384,7 +30796,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:29387: checking for $ac_word" >&5
+echo "$as_me:30799: 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
@@ -29401,7 +30813,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:29404: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30816: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29412,10 +30824,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:29415: result: $ZIP" >&5
+  echo "$as_me:30827: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:29418: result: no" >&5
+  echo "$as_me:30830: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29483,7 +30895,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29486: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30898: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -29510,7 +30922,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:29513: checking for $ac_word" >&5
+echo "$as_me:30925: 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
@@ -29527,7 +30939,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:29530: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30942: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29538,10 +30950,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:29541: result: $INSTALL" >&5
+  echo "$as_me:30953: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:29544: result: no" >&5
+  echo "$as_me:30956: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29609,7 +31021,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29612: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31024: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -29635,7 +31047,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:29638: checking for X" >&5
+	echo "$as_me:31050: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -29732,17 +31144,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 29735 "configure"
+#line 31147 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:29739: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:31151: \"$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:29745: \$? = $ac_status" >&5
+  echo "$as_me:31157: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -29775,7 +31187,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 29778 "configure"
+#line 31190 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -29787,16 +31199,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29793: \$? = $ac_status" >&5
+  echo "$as_me:31205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29799: \$? = $ac_status" >&5
+  echo "$as_me:31211: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -29834,7 +31246,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:29837: result: $have_x" >&5
+  echo "$as_me:31249: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -29844,7 +31256,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:29847: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:31259: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -29868,11 +31280,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:29871: checking whether -R must be followed by a space" >&5
+      echo "$as_me:31283: 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 29875 "configure"
+#line 31287 "configure"
 #include "confdefs.h"
 
 int
@@ -29884,16 +31296,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31299: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29890: \$? = $ac_status" >&5
+  echo "$as_me:31302: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31305: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29896: \$? = $ac_status" >&5
+  echo "$as_me:31308: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -29903,13 +31315,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:29906: result: no" >&5
+	echo "$as_me:31318: 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 29912 "configure"
+#line 31324 "configure"
 #include "confdefs.h"
 
 int
@@ -29921,16 +31333,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29924: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29927: \$? = $ac_status" >&5
+  echo "$as_me:31339: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29933: \$? = $ac_status" >&5
+  echo "$as_me:31345: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -29940,11 +31352,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:29943: result: yes" >&5
+	  echo "$as_me:31355: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:29947: result: neither works" >&5
+	  echo "$as_me:31359: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -29964,7 +31376,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 29967 "configure"
+#line 31379 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29983,22 +31395,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31398: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29989: \$? = $ac_status" >&5
+  echo "$as_me:31401: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29995: \$? = $ac_status" >&5
+  echo "$as_me:31407: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:30001: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:31413: 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
@@ -30006,7 +31418,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30009 "configure"
+#line 31421 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30025,16 +31437,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30031: \$? = $ac_status" >&5
+  echo "$as_me:31443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30037: \$? = $ac_status" >&5
+  echo "$as_me:31449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -30045,14 +31457,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30048: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:31460: 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:30055: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:31467: 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
@@ -30060,7 +31472,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30063 "configure"
+#line 31475 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30079,16 +31491,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31494: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30085: \$? = $ac_status" >&5
+  echo "$as_me:31497: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30091: \$? = $ac_status" >&5
+  echo "$as_me:31503: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -30099,7 +31511,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30102: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:31514: 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"
@@ -30118,13 +31530,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:30121: checking for gethostbyname" >&5
+    echo "$as_me:31533: 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 30127 "configure"
+#line 31539 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -30155,16 +31567,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31570: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30161: \$? = $ac_status" >&5
+  echo "$as_me:31573: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30167: \$? = $ac_status" >&5
+  echo "$as_me:31579: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -30174,11 +31586,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30177: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:31589: 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:30181: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:31593: 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
@@ -30186,7 +31598,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30189 "configure"
+#line 31601 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30205,16 +31617,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31620: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30211: \$? = $ac_status" >&5
+  echo "$as_me:31623: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31626: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30217: \$? = $ac_status" >&5
+  echo "$as_me:31629: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -30225,14 +31637,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30228: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:31640: 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:30235: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:31647: 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
@@ -30240,7 +31652,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30243 "configure"
+#line 31655 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30259,16 +31671,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30262: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31674: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30265: \$? = $ac_status" >&5
+  echo "$as_me:31677: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30268: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30271: \$? = $ac_status" >&5
+  echo "$as_me:31683: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -30279,7 +31691,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30282: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:31694: 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"
@@ -30295,13 +31707,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:30298: checking for connect" >&5
+    echo "$as_me:31710: 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 30304 "configure"
+#line 31716 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -30332,16 +31744,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31747: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30338: \$? = $ac_status" >&5
+  echo "$as_me:31750: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31753: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30344: \$? = $ac_status" >&5
+  echo "$as_me:31756: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -30351,11 +31763,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30354: result: $ac_cv_func_connect" >&5
+echo "$as_me:31766: 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:30358: checking for connect in -lsocket" >&5
+      echo "$as_me:31770: 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
@@ -30363,7 +31775,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30366 "configure"
+#line 31778 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30382,16 +31794,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30388: \$? = $ac_status" >&5
+  echo "$as_me:31800: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31803: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30394: \$? = $ac_status" >&5
+  echo "$as_me:31806: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -30402,7 +31814,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30405: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:31817: 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"
@@ -30411,13 +31823,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:30414: checking for remove" >&5
+    echo "$as_me:31826: 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 30420 "configure"
+#line 31832 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -30448,16 +31860,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30454: \$? = $ac_status" >&5
+  echo "$as_me:31866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30460: \$? = $ac_status" >&5
+  echo "$as_me:31872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -30467,11 +31879,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30470: result: $ac_cv_func_remove" >&5
+echo "$as_me:31882: 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:30474: checking for remove in -lposix" >&5
+      echo "$as_me:31886: 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
@@ -30479,7 +31891,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30482 "configure"
+#line 31894 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30498,16 +31910,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31913: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30504: \$? = $ac_status" >&5
+  echo "$as_me:31916: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30510: \$? = $ac_status" >&5
+  echo "$as_me:31922: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -30518,7 +31930,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30521: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:31933: 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"
@@ -30527,13 +31939,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:30530: checking for shmat" >&5
+    echo "$as_me:31942: 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 30536 "configure"
+#line 31948 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -30564,16 +31976,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30570: \$? = $ac_status" >&5
+  echo "$as_me:31982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30576: \$? = $ac_status" >&5
+  echo "$as_me:31988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -30583,11 +31995,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30586: result: $ac_cv_func_shmat" >&5
+echo "$as_me:31998: 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:30590: checking for shmat in -lipc" >&5
+      echo "$as_me:32002: 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
@@ -30595,7 +32007,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30598 "configure"
+#line 32010 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30614,16 +32026,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30617: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30620: \$? = $ac_status" >&5
+  echo "$as_me:32032: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30626: \$? = $ac_status" >&5
+  echo "$as_me:32038: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -30634,7 +32046,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30637: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:32049: 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"
@@ -30652,7 +32064,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:30655: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:32067: 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
@@ -30660,7 +32072,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30663 "configure"
+#line 32075 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30679,16 +32091,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30682: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30685: \$? = $ac_status" >&5
+  echo "$as_me:32097: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30691: \$? = $ac_status" >&5
+  echo "$as_me:32103: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -30699,7 +32111,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30702: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:32114: 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"
@@ -30717,7 +32129,7 @@ LDFLAGS="$X_LIBS $LDFLAGS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:30720: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:32132: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -30778,7 +32190,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:30781: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:32193: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -30786,7 +32198,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:30789: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:32201: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -30794,14 +32206,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:30797: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:32209: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 30804 "configure"
+#line 32216 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30813,16 +32225,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30819: \$? = $ac_status" >&5
+  echo "$as_me:32231: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30825: \$? = $ac_status" >&5
+  echo "$as_me:32237: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30830,12 +32242,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:30833: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:32245: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:30838: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:32250: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -30843,13 +32255,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:30846: checking for XOpenDisplay" >&5
+echo "$as_me:32258: 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 30852 "configure"
+#line 32264 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -30880,16 +32292,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32295: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30886: \$? = $ac_status" >&5
+  echo "$as_me:32298: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30892: \$? = $ac_status" >&5
+  echo "$as_me:32304: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -30899,13 +32311,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30902: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:32314: 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:30908: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:32320: 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
@@ -30913,7 +32325,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 30916 "configure"
+#line 32328 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30932,16 +32344,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30938: \$? = $ac_status" >&5
+  echo "$as_me:32350: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30944: \$? = $ac_status" >&5
+  echo "$as_me:32356: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -30952,7 +32364,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30955: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:32367: 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"
@@ -30960,13 +32372,13 @@ fi
 
 fi
 
-echo "$as_me:30963: checking for XtAppInitialize" >&5
+echo "$as_me:32375: 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 30969 "configure"
+#line 32381 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -30997,16 +32409,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31003: \$? = $ac_status" >&5
+  echo "$as_me:32415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31009: \$? = $ac_status" >&5
+  echo "$as_me:32421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -31016,13 +32428,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:31019: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:32431: 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:31025: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:32437: 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
@@ -31030,7 +32442,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31033 "configure"
+#line 32445 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31049,16 +32461,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31052: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31055: \$? = $ac_status" >&5
+  echo "$as_me:32467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31061: \$? = $ac_status" >&5
+  echo "$as_me:32473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -31069,7 +32481,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31072: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:32484: 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
@@ -31083,7 +32495,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:31086: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:32498: 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
@@ -31093,7 +32505,7 @@ fi
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:31096: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:32508: 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=
 
@@ -31104,14 +32516,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:31107: result: yes" >&5
+	echo "$as_me:32519: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:31110: result: no" >&5
+	echo "$as_me:32522: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:31114: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:32526: 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=
 
@@ -31122,14 +32534,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:31125: result: yes" >&5
+	echo "$as_me:32537: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:31128: result: no" >&5
+	echo "$as_me:32540: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:31132: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:32544: 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=
 
@@ -31140,14 +32552,14 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:31143: result: yes" >&5
+	echo "$as_me:32555: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:31146: result: no" >&5
+	echo "$as_me:32558: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:31150: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:32562: 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
@@ -31155,7 +32567,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31158 "configure"
+#line 32570 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31174,16 +32586,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31180: \$? = $ac_status" >&5
+  echo "$as_me:32592: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31186: \$? = $ac_status" >&5
+  echo "$as_me:32598: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -31194,7 +32606,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31197: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:32609: 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"
@@ -31216,14 +32628,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:31219: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:32631: 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:31222: checking for $cf_test" >&5
+			echo "$as_me:32634: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 31226 "configure"
+#line 32638 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -31237,16 +32649,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32652: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31243: \$? = $ac_status" >&5
+  echo "$as_me:32655: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31249: \$? = $ac_status" >&5
+  echo "$as_me:32661: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -31255,7 +32667,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:31258: result: $cf_result" >&5
+		echo "$as_me:32670: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -31267,7 +32679,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:31270: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:32682: 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"
@@ -31292,15 +32704,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:31295: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:32707: 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:31299: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:32711: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 31303 "configure"
+#line 32715 "configure"
 #include "confdefs.h"
 
 int
@@ -31312,16 +32724,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32727: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31318: \$? = $ac_status" >&5
+  echo "$as_me:32730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31324: \$? = $ac_status" >&5
+  echo "$as_me:32736: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -31330,7 +32742,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:31333: result: $cf_result" >&5
+			echo "$as_me:32745: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -31342,7 +32754,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:31345: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:32757: 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
@@ -31357,7 +32769,7 @@ for ac_prog in xcurses-config
 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:31360: checking for $ac_word" >&5
+echo "$as_me:32772: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -31374,7 +32786,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_XCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:31377: found $ac_dir/$ac_word" >&5
+   echo "$as_me:32789: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31385,10 +32797,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:31388: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:32800: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:31391: result: no" >&5
+  echo "$as_me:32803: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31409,7 +32821,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:31412: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:32824: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -31470,7 +32882,7 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me-configure}:31473: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:32885: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -31478,7 +32890,7 @@ fi
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me-configure}:31481: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:32893: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -31486,14 +32898,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:31489: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:32901: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 31496 "configure"
+#line 32908 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31505,16 +32917,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32920: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31511: \$? = $ac_status" >&5
+  echo "$as_me:32923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31517: \$? = $ac_status" >&5
+  echo "$as_me:32929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31522,12 +32934,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:31525: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:32937: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:31530: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:32942: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -31535,7 +32947,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:31538: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:32950: 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
@@ -31543,7 +32955,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31546 "configure"
+#line 32958 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31562,16 +32974,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31568: \$? = $ac_status" >&5
+  echo "$as_me:32980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31574: \$? = $ac_status" >&5
+  echo "$as_me:32986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -31582,13 +32994,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31585: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:32997: 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:31591: checking for XCurses library" >&5
+echo "$as_me:33003: 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
@@ -31596,7 +33008,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31599 "configure"
+#line 33011 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -31611,16 +33023,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31614: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31617: \$? = $ac_status" >&5
+  echo "$as_me:33029: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31623: \$? = $ac_status" >&5
+  echo "$as_me:33035: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -31631,7 +33043,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31634: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:33046: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -31650,14 +33062,14 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:31653: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:33065: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:31660: checking if we can include termio.h with curses" >&5
+echo "$as_me:33072: 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
@@ -31667,7 +33079,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 31670 "configure"
+#line 33082 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -31681,16 +33093,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31684: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31687: \$? = $ac_status" >&5
+  echo "$as_me:33099: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31693: \$? = $ac_status" >&5
+  echo "$as_me:33105: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -31703,7 +33115,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:31706: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:33118: 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
@@ -31718,23 +33130,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:31721: checking for $ac_header" >&5
+echo "$as_me:33133: 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 31727 "configure"
+#line 33139 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31731: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:33143: \"$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:31737: \$? = $ac_status" >&5
+  echo "$as_me:33149: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31753,7 +33165,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:31756: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:33168: 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
@@ -31763,7 +33175,7 @@ EOF
 fi
 done
 
-echo "$as_me:31766: checking if curses supports alternate-character set" >&5
+echo "$as_me:33178: 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
@@ -31772,7 +33184,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31775 "configure"
+#line 33187 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -31786,16 +33198,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33201: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31792: \$? = $ac_status" >&5
+  echo "$as_me:33204: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31798: \$? = $ac_status" >&5
+  echo "$as_me:33210: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -31809,20 +33221,20 @@ done
 
 fi
 
-echo "$as_me:31812: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:33224: 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:31818: checking if curses supports fancy attributes" >&5
+echo "$as_me:33230: 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 31825 "configure"
+#line 33237 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -31840,16 +33252,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31846: \$? = $ac_status" >&5
+  echo "$as_me:33258: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31852: \$? = $ac_status" >&5
+  echo "$as_me:33264: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -31861,13 +33273,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31864: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:33276: 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:31870: checking for function curses_version" >&5
+echo "$as_me:33282: 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
@@ -31877,7 +33289,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 31880 "configure"
+#line 33292 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -31890,15 +33302,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:31893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31896: \$? = $ac_status" >&5
+  echo "$as_me:33308: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:31898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31901: \$? = $ac_status" >&5
+  echo "$as_me:33313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -31913,21 +33325,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:31916: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:33328: 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:31923: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:33335: 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 31930 "configure"
+#line 33342 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -31946,16 +33358,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31952: \$? = $ac_status" >&5
+  echo "$as_me:33364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31958: \$? = $ac_status" >&5
+  echo "$as_me:33370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -31967,10 +33379,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31970: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:33382: 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:31973: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:33385: 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
@@ -31979,14 +33391,14 @@ EOF
 fi
 fi
 
-echo "$as_me:31982: checking if curses supports color attributes" >&5
+echo "$as_me:33394: 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 31989 "configure"
+#line 33401 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -32006,16 +33418,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32009: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32012: \$? = $ac_status" >&5
+  echo "$as_me:33424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32018: \$? = $ac_status" >&5
+  echo "$as_me:33430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -32027,7 +33439,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:32030: result: $cf_cv_color_curses" >&5
+echo "$as_me:33442: 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
@@ -32047,23 +33459,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:32050: checking for $ac_header" >&5
+echo "$as_me:33462: 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 32056 "configure"
+#line 33468 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:32060: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:33472: \"$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:32066: \$? = $ac_status" >&5
+  echo "$as_me:33478: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -32082,7 +33494,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:32085: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:33497: 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
@@ -32097,23 +33509,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:32100: checking for $ac_header" >&5
+echo "$as_me:33512: 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 32106 "configure"
+#line 33518 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:32110: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:33522: \"$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:32116: \$? = $ac_status" >&5
+  echo "$as_me:33528: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -32132,7 +33544,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:32135: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:33547: 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
@@ -32150,10 +33562,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:32153: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:33565: 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 32156 "configure"
+#line 33568 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -32165,16 +33577,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32171: \$? = $ac_status" >&5
+  echo "$as_me:33583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32177: \$? = $ac_status" >&5
+  echo "$as_me:33589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -32182,7 +33594,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 32185 "configure"
+#line 33597 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -32196,16 +33608,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32202: \$? = $ac_status" >&5
+  echo "$as_me:33614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32208: \$? = $ac_status" >&5
+  echo "$as_me:33620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -32220,12 +33632,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:32223: result: $termios_bad" >&5
+	echo "$as_me:33635: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:32228: checking declaration of size-change" >&5
+echo "$as_me:33640: 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
@@ -32240,7 +33652,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 32243 "configure"
+#line 33655 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -32284,16 +33696,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32287: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32290: \$? = $ac_status" >&5
+  echo "$as_me:33702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32296: \$? = $ac_status" >&5
+  echo "$as_me:33708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -32312,7 +33724,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:32315: result: $cf_cv_sizechange" >&5
+echo "$as_me:33727: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -32329,14 +33741,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:32332: checking if ttytype is declared in curses library" >&5
+echo "$as_me:33744: 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 32339 "configure"
+#line 33751 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -32348,16 +33760,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33763: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32354: \$? = $ac_status" >&5
+  echo "$as_me:33766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32360: \$? = $ac_status" >&5
+  echo "$as_me:33772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -32369,7 +33781,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:32372: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:33784: 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
@@ -32377,14 +33789,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:32380: checking if curses supports wide characters" >&5
+echo "$as_me:33792: 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 32387 "configure"
+#line 33799 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32403,16 +33815,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32409: \$? = $ac_status" >&5
+  echo "$as_me:33821: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32415: \$? = $ac_status" >&5
+  echo "$as_me:33827: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -32423,7 +33835,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32426: result: $cf_cv_widec_curses" >&5
+echo "$as_me:33838: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -32432,14 +33844,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:32435: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:33847: 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 32442 "configure"
+#line 33854 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32453,23 +33865,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32456: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32459: \$? = $ac_status" >&5
+  echo "$as_me:33871: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32465: \$? = $ac_status" >&5
+  echo "$as_me:33877: \$? = $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 32472 "configure"
+#line 33884 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32484,16 +33896,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32487: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33899: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32490: \$? = $ac_status" >&5
+  echo "$as_me:33902: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32496: \$? = $ac_status" >&5
+  echo "$as_me:33908: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -32505,7 +33917,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:32508: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:33920: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -32526,14 +33938,14 @@ fi
 
 	fi
 
-echo "$as_me:32529: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:33941: 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 32536 "configure"
+#line 33948 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32550,23 +33962,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32556: \$? = $ac_status" >&5
+  echo "$as_me:33968: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32562: \$? = $ac_status" >&5
+  echo "$as_me:33974: \$? = $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 32569 "configure"
+#line 33981 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -32584,16 +33996,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32590: \$? = $ac_status" >&5
+  echo "$as_me:34002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32596: \$? = $ac_status" >&5
+  echo "$as_me:34008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -32605,11 +34017,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:32608: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:34020: 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:32612: checking for term.h" >&5
+echo "$as_me:34024: 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
@@ -32622,7 +34034,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 32625 "configure"
+#line 34037 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -32636,16 +34048,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32642: \$? = $ac_status" >&5
+  echo "$as_me:34054: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32648: \$? = $ac_status" >&5
+  echo "$as_me:34060: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -32658,7 +34070,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:32661: result: $cf_cv_term_header" >&5
+echo "$as_me:34073: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -32709,10 +34121,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:32712: checking for ${cf_func}" >&5
+	echo "$as_me:34124: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:32715: testing ${cf_func} ..." 1>&5
+echo "${as_me-configure}:34127: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32721,7 +34133,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 32724 "configure"
+#line 34136 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -32755,16 +34167,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34170: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32761: \$? = $ac_status" >&5
+  echo "$as_me:34173: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34176: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32767: \$? = $ac_status" >&5
+  echo "$as_me:34179: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -32780,7 +34192,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:32783: result: $cf_result" >&5
+	echo "$as_me:34195: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -32796,13 +34208,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:32799: checking for $ac_func" >&5
+echo "$as_me:34211: 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 32805 "configure"
+#line 34217 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -32833,16 +34245,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34248: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32839: \$? = $ac_status" >&5
+  echo "$as_me:34251: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32845: \$? = $ac_status" >&5
+  echo "$as_me:34257: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -32852,7 +34264,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32855: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:34267: 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
@@ -32866,12 +34278,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:32869: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:34281: 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:32874: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:34286: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32879,7 +34291,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:32882: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:34294: 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
@@ -32984,7 +34396,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:32987: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:34399: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -33160,7 +34572,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:33163: error: ambiguous option: $1
+    { { echo "$as_me:34575: 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;}
@@ -33179,7 +34591,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:33182: error: unrecognized option: $1
+  -*) { { echo "$as_me:34594: 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;}
@@ -33232,7 +34644,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:33235: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:34647: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -33549,7 +34961,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:33552: creating $ac_file" >&5
+    { echo "$as_me:34964: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -33567,7 +34979,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:33570: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:34982: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -33580,7 +34992,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:33583: error: cannot find input file: $f" >&5
+           { { echo "$as_me:34995: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -33646,7 +35058,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:33649: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:35061: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -33657,7 +35069,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:33660: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:35072: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -33670,7 +35082,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:33673: error: cannot find input file: $f" >&5
+           { { echo "$as_me:35085: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -33788,7 +35200,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:33791: $ac_file is unchanged" >&5
+      { echo "$as_me:35203: $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 53a829bb..ee45be33 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.170 2008/09/21 23:26:29 tom Exp $
+dnl $LynxId: configure.in,v 1.171 2008/09/23 22:39:58 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -717,6 +717,7 @@ AC_TYPE_MODE_T
 CF_CHECK_TYPE(socklen_t, int, [#include <sys/socket.h>])
 CF_TM_GMTOFF
 
+AC_CHECK_SIZEOF(long,4)
 AC_CHECK_SIZEOF(off_t,4)
 AC_CHECK_SIZEOF(time_t,4)
 
diff --git a/docs/CHANGES2.3 b/docs/CHANGES2.3
deleted file mode 100644
index f1a480a2..00000000
--- a/docs/CHANGES2.3
+++ /dev/null
@@ -1,458 +0,0 @@
---- RELEASE of 2.3  (19-May-1994) ---
-5-19-94
-* Better memory allocation routines used for some VMS systems.
-5-19-94
-* Non-interactive (-source) access to documents requiring access authorization
-  not allowed to avoid crashes.
-3-30-94
-* Lynx exports the environment variable LYNX_VERSION on UNIX systems
-  with the current version number as the value.
-3-29-94
-* added "action=" handling to ISINDEX tags.  (Is that in the spec?)
-3-27-94
-* fixed Telnet security problem
-3-19-94
-* added .mailcap and mailcap support as well as mime.types support
-  for the configuration of viewers and extension mappings.
-  The test command is now implemented so that viewers can be conditionally
-  setup.
-3-17-94
-* Revamped the FTP code to recognize different server types and to parse
-  full directory listings (LIST output).  File types, sizes and dates
-  are displayed when possible.
-3-16-94
-* added transparent support for mosaic bookmark files.  Just point
-  Lynx at your existing default mosaic bookmark file and Lynx will
-  handle the rest.  Viewing, addition, and removal are supported.
-3-15-94
-* added second line of reverse video to show multiline links better.
-3-10-94
-* added configurable MIME types and viewers to lynx.cfg.  MIME types
-  and VIEWERS can be configured by following the instructions within
-  the newest lynx.cfg file.
-3-?-94
-* added second %s argument to PRINTER and DOWNLOADER definitions.
-  If a second %s is present in the command definition it will be
-  filled in by a suggested filename which is derived from the URL
-  of the document.  See lynx.cfg for more details.
-3-?-94
-* got code from CERN to fix HTBTree FTP bug.  Large ftp lists should
-  not crash anymore.
-3-9-94
-* added no_proxy environment variable.  set it to a comma delimited list
-  of domains or hosts that should not be proxyed. (Thanks CERN :)
-  USAGE: (UNIX)
-     setenv no_proxy "domain1.dom, domain2.dom, domain3, etc"
-3-?-94
-* Fixed Referer: field handleing so that it doesn't crash on really
-  long URL's
-3-?-94
-* True popup menus are now supported for non-multiple SELECT lists.
-2-28-94
-* fixed the delete-a-bookmark command and bound it to 'r' for remove.
-  (thanks to David Trueman for the fix)
-
----------- RELEASE of 2.2 ------------------
-2-9-94
-* added 'd' for download current link.  Can be used to force a download
-  of any file.
-* 'r' removed as a comment key.  Use 'c' or reconfigure your keys to
-  add 'r' back in.  (I would like to use 'r' in the future to mean
-  remove current bookmark link)
-* Found the bug in the HTTP redirection code that was causing it
-  not to work.  So HTTP redirection appears to work now!
-* Added Referer: header to HTTP requests to list the URL of
-  the document listing the requsted URL.   Here's an extract from CERN:
-     This optional header field allows the client to specify,
-     for the server's benefit, the address ( URI ) of the document
-     (or element within the document) from which the URI in the
-     request was obtained.
-
-     This allows a server to generate lists of back-links to documents,
-     for interest, logging, etc.  It allows bad links to be traced
-     for maintenance.
-
-2-8-94
-* changed novice line to be displayed on bottom two lines with the
-  status line moved up two lines.
-1-27-94
-* Made configurable keymappings a reality.  Keys can be remapped in
-  the lynx.cfg file.  (diffs from David Trueman)
-* Got code from Foteos to make 'a' work for VMS connection interrupts.
-1-24-94
-* Moving closer towards configurable keymappings.  New keyhandleing
-  code will make it very easy to implement. (diffs from David Trueman)
-1-14-94
-* Lynx FTP now supports PASV code. (fixes to CERN (Dave Raggert?) PASV code
-  from John Ellson)  It is not enabled by default.  Line 43 in
-  WWW/Library/Implementation/HTFTP must be commented out for
-  PASV code to be used.  This was done because not all FTP sites
-  can support PASV FTP.
-1-13-94
-* slight change in forms user interface.  For the better, I hope you will
-  agree.  Text input fields are now active as soon as the cursor pointer
-  is over them.  Therefore you may begin typing into the text field
-  as soon as you come to it.  Tab, and up and down arrow keys will
-  move off of the text input field.  The only problem with this is as
-  follows.  If you are in the habit of using the number keys (keypad)
-  the or h,j,k,l vi keys, as soon as you move over the text link
-  you will begin seeing numbers or hjk or l show up in the text field.
-  In other words, your movement commands are now broken :(  You must
-  use true arrow keys or the tab key to move off of the text field.
-  I've tried this out and it seems to work alright.  I don't think
-  that users unfamiliar with this will have too hard a time figureing
-  it out.  Once you see numbers or letter appearing it becomes fairly
-  obvious whats going on.  I'll put a message at the bottom of the
-  screen saying "use tab or arrow keys to move off of link."
-* added mods by David Trueman to implement -restrictions commandline
-  option.  -restrictions allows a list of services to be disabled
-  selectively. -restrictions takes the form of
-  "lynx -restrictions=[default],[all],[inside_telnet],[outside_telnet],[shell],\
-	[editor],[bookmark],[option_save],[print],[file_url],[download],[exec]"
-
-   all             restricts all options.
-   default         same as commandline option -anonymous.  Disables
-	           default services for anonymous users.  Currently set to,
-	           all restricted except for: inside_telnet, outside_telnet, and
-	           goto.  Defaults settable within userdefs.h
-   inside_telnet   disallow telnets for people coming from inside your
-		   domain.
-   outside_telnet  disallow telnets for people coming from outside your
-		   domain.
-   shell	   disallow shell escapes
-   editor	   disallow editing
-   bookmark	   disallow changing the location of the bookmark file.
-   options_save    disallow saving options in .lynxrc
-   print           disallow most print options
-   goto            disable the 'g' (goto) command.
-   file_url        disallow using G)oto to go to file: URL's
-   download        disallow saving binary files to disk in the download menu.
-   exec            disable execution scripts
-   exec_frozen     disallow the user from changing the execution link
-		   setting in the O)ptions menu.
-1-12-93
-* added new more informative messages for form links.
-1-11-93
-* fixed -dump and -source options so that they work for
-  binary files now.
-* Interruptable I/0 now completely works for UNIX systems.
-  VMS is next.  Just hit an 'a' for abort anytime during a
-  transfer to abort.  If there is a partial file to show, it
-  will be shown.
-* Added command line option -show_curser.  If enabled the curser
-  will not be hidden in the right hand corner but will instead
-  be positioned at the start of the currently selected link.
-  show curser is the default for systems without FANCY_CURSES
-  capibilities, and the default configuration can be changed in
-  userdefs.h
-1-9-93
-* Added NNTP posting capibilities.  Currently uses external inews
-  program which will be included in the utils directory.
-  Would someone like to patch in some freeware inews code, or
-  send me some?
-1-7-93
-* fixed bug in password handling which cuased it to be displayed
-  accidentally :(  (Danny Mayer)
-1-6-94
-* bold and emphasis now use curses underlining to represent
-  ephasized text.  The use of _underline_ chars before and after
-  the text is now removed.
-1-5-94
-* Added configurable download menu so that binary files may
-  be downloaded using any protocal.  Download menu is displayed
-  after selecting a non-displayable file.
-* Added exec links.  4 types currently defined:
-    files ending in:  .csh, .ksh, .sh, (for UNIX)  and .com (for VMS);
-  Use exec link controls to turn on and off exec links.
-* Gopher menues are now within PRE so that spaces are not
-  collapsed in menu entries.
-* added configurable character sets.  Can be set in lynx.cfg
-  by the user in the options screen or in the users .lynxrc file
-  current sets are: ISO Latin I, IBM PC Character set, & 7 bit
-  approximations.  New sets can be added to src/LYCharSets.c
-
-----------RELEASE of Lynx 2.1 and 2.1.1----------------------
--grey area-
-* Ability to FTP to VMS systems. (Foteos Macrides)
-* Fixed lots of display and interupt problems (Foteos Macrides)
-* The Lynx Bookmark file is now interpreted as an HTML document.
-  Old Lynx bookmark files must be converted using the lynx2html
-  program or deleted.
-* HTML+ forms as implemented by XMosaic now work.
-  fill in the empty spaces and press the submit button to
-  submit the form.
-* The TEXTAREA tag isn't done yet.  It will currently only
-  give a one line text area.  The next version of Lynx will
-  include a true textarea implementation once I figure out a
-  reasonable interface.
-* Incorporated WWWlib 2.14 and fixed up the descrip.mms files.
-  Foteos Macrides made VMS port changes and wrote a really nice
-  build.com script to make compilation on VMS systems really easy.
-  Foteos also ported Lynx to OpenVMS for alpha axp systems.
-* 's' now means search a searchable indexed document through the
-  server, and can no longer be used to search for strings within
-  the displayed document.
-* '/' now only searches through the current displayed document for
-  strings and can not be used for searchable index documents.
-* Capital 'Q' now quits without asking for confirmation.
-* 'm' for Main Menu now askes for confirmation and does NOT clear
-  the history stack.
-* Blockquote style changed slightly.
-* fixed bug with A and other tags messing up formatting
-  withing PRE segments.
-* Verbose Gopher option removed, verbose gopher functionality
-  is now set permenantly on.
-* Default editor is now configurable in the lynx.cfg file.
-* Default bookmark file is now configurable in the lynx.cfg file.
-
-12-15-93
-* ownership is no longer inherited.
-* link rev="owner" href="mailto:ADDRESS" now accepted as well as
-  link rev="made" href="mailto:ADDRESS" to define the URL of the
-  owner or person responsible for the info.
-* 's' now only searches ISINDEX server documents.
-* '/' always means search within the document.
-
--grey area-
-* still doing massive rewrite.  Debugging!!
-
-11-30-93
-* anonymous users cannot change the bookmark page! (thanks to Jyrki Kuoppal for
-  pointing out a security hole)
-
--grey area-
-* massive rewrite.  Removed all Lynx internal format code and
-  restructured all the source files.
-
-11-8-93
-* added &nbsp; (non-breaking space), &ensp; and &emsp;
-
----------- RELEASE of 2.0.12 -----------------
-11-1-93
-* Change HTInit.c so that unsupported types are not sent out
-  in accept parameters.  For non X screen only text/html and
-  application/octet-stream are sent.
-
-10-26-93
-* descriptive title added to files mailed from lynx
-
-10-25-93
-* disabled FTP connection caching to help fix multiple FTP problems
-
-10-23-93
-* added preliminary level 1 forms support.
-
-10-20-93
-* fixed a bunch of gopher holes
-* gopher lists are turned into URL's now instead of lynx
-  internal format document links
-* local documents ending in .html can now be referenced with
-  just a filename and/or path from the command line.
-
-10-19-93
-* Added preloaded searches to gopher URL's.  They previously
-  didn't work.  This is readily apparent as preloaded CSO
-  searches, which alot of people wanted.
-* removed old hytelnet compatibility code which looked in
-  multiple directories to find the correct file.  If you still
-  need this capibility talk to me.
-
-10-12-93
-* The users specified editor is now spawned for mail messages.
-  If no editor is defined or if the user is anonymous, the built-in
-  lynx mail sender is used.
-
-10-11-93
-* changed all static data structures to be dynamic
-  This was a pretty major change of code which may add several
-  bugs.
-* rewrote parse_links routine to make it more efficient and to
-  work with dynamic structures.
-
-10-6-93
-* added progress messages to HTTP transfers.
-
-10-5-93
-* added -cache=# command line option to specify the number
-  of WWW documents cached in memory.
-
-9-28-93
-* added VMS port fixes from Foteos Macrides.  Lynx now
-  compiles and works on VMS!
-* fixed ftp bug in WWWlib that didn't de-escape URL's before
-  sending request to FTP server.
-
-9-21-93
-* fixed coredump bug for some files with no links.
-
-9-3-93
-* Moved many configuration options including printer setup to
-  lynx.cfg file.  The default placement of the lynx.cfg file
-  will be /usr/local/lib & sys$public
-
-9-1-93
-* Removed STARTDIR variable from userdefs.h  STARTDIR is now inferred
-  from the STARTFILE.
-
-8-30-93
-* Fixed bug with only one link selectable out of many on the last line
-  of the display.
-* Ported to SVR4 courtesy of Nickolay Saukh (from Russia, Wow this is
-  really getting around!)
-* Uneditable documents don't get refetched. (Nickolay Saukh)
-* National language support through LOCALE
-  (instead of ISOLATIN1), protected by #ifdef LOCALE (Nickolay Saukh)
-
-------Release of Lynx 2.0.11--------------------------------
-8-27-93
-* Caused major international incident when a large bug was discovered after
-  release. :)
-* Fixed internal document hypertext refernces with URL's.  '#selector'
-  strings now work again.
-
-8-24-93
-* When files come through on pre HTTP/1.0 servers they are now
-  recognized by their file extensions
-
-8-23-93
-* Lynx can now speak to old NCSA pre HTTP/1.0 servers
-* fixed ALT bug that had to do with style changes not
-  happening before the alt was printed.
-
-8-21-93
-* updated the man file lynx.1.
-
-8-19-93
-* updated help and converted it to HTML.  Made a new help location and
-  server.  The new default help file is
-  http://kufacts.cc.ukans.edu/lynx_help/lynx_help_main.html
-
-8-15-93
-* changed '\' to toggle between source and no source.  When you press
-  '\' while viewing a rendered HTML document you will get the HTML source
-  when you press '\' while viewing HTML source you will get the
-  rendered HTML.
-* Added ALT attribute to IMG tag.  When ALT is available the contents
-  are displayed.  When ALT is missing [IMAGE] is displayed.  When
-  ALT="" nothing is displayed.
-
-8-14-93
-* Added document reload command.  CTRL-R when pressed will reload
-  the document into memory and redisplay it, clearing the screen.
-  This is very useful when editing documents, outside of Lynx while
-  using Lynx for rendering.
-* Added source view mode.  '\' when pressed will reload the document
-  and display the HTML source. (doesn't work for gopher directoryies right
-  now, but gopher isn't HTML anyways)
-* fixed bug in LibWWW that caused it not to be able to convert to
-  www/source.
-* fixed bug in LibWWW that caused most binary file transfers to fail
-* added binary file transfer ability.  When binary files are selected
-  the user is prompted for a file name to save to.  The default directory
-  is the one the user started in.
-* Lynx now reloads local HTML files and re-renders them after editing.
-
-??-??-??
-* At some point I added the ability to edit HTML files on the local
-  machine.
-
-8-12-93
-* Added Nested Lists, up to six levels, with different bullets
-  for each level.
-* Due to the fact that nearly everyone seems to use P to mean
-  two returns within the same style, and Mosaic has been kind
-  enough to support this meaning, :( :( :(  I have changed
-  the P tag to reflect this interpretation.  P can be used
-  anywhere and will mean insert two returns.  (i.e., two BR tags)
-
-8-11-93
-* Made the default Mime type for unknown file types on ftp servers
-  to be text/plain.  Previously the WWWLibrary had the default
-  as application/octet-stream which meant that most files could not
-  be viewed.
-* Changed the ADDRESS style to be more like XMosaic
-  Left flush, newline top and bottom
-* The Statusline now displays the URL when retrieving files.
-* added BR (linebreak) tag!
-  The BR tag inserts a line break and maintains the current style!
-  The BR tag may be used anywhere.
-* added HR (horizontal rule tag!)
-  The HR tag puts a horizontal line seperating two bodies of text.
-  The HR tag may be used anywhere.
-
-8-8-93
-* All spaces, tabs and returns are now collapsed down do one
-  space.
-* fixed bug whiched caused certain links beginning at the
-  begining of a line to be bad.
-* added '*' (stars) to unordered lists and numbers to ordered
-  lists.
-* changed dir lists to be more like menu lists.
-* all emphasis, physical and symantic, now have _underlines_
-  around them to show emphasis.
-
-
-RELEASE OF VER 2.0.10 -----------------------------------------------
-
-7-8-93
-Added [IMAGE] in all places where IMG tags appear.
-added WWW_HOME environment variable support.
-fixed searching in WWW.
-removed tildas from mail messages for security reasons.
-added emacs-like key defs.
-changed gopher dir routines and Verbose format of directories
-
-6-30-93
-Forgot to put all kinds of bug fixes and stuff in here during the
-past month.  I have been working on upgrading to the 2.X WWWlibrary
-Today I changed 'g' to mean goto a url, and 'v' to be view the
-bookmark page.
-
-5-30-93
-Fixed problem with ftp: URL not being recognized and not working.
-
-5-28-93
-Tried to remove the use of tabs and replace them with appropriate
-spaces.  This was done to support brain dead curses packages that
-don't handle tabs. (like linux)
-
-5-20-93
-Fixed socket problem which was causing a problem with telnet's
-connecting
-
-5-18-93
-Fixed SUN curses problem, now works with the /usr/5lib routines
-
-4-9-93
-Added an option to turn on link numbering
-
-4-7-93
-Fixed read_rc() bug which caused .lynxrc files to be read incorrectly
-Fixed file cacheing bug which only allowed searching to be performed
-once.  (it cached the answer and displayed that each time a new
-search was requested)
-
-4-2-93
-Fixed VMS I/O bug and TCP routines.
-
-4-1-93
-Ported 2.0 to VMS
-
-3-17-93
-Fixed a bug: Multiply defined procedure async_abort in
-the files get_file and get_bin_file
-
-3-16-93
-Optomized Gopher TCP routines, increased speed by a factor of 10!
-
-3-9-93
-Added WWW support by integrating the WWWlib1.4
-
-2-10-93
-Added home page support and append features.
-
-12-22-92
-Added support for Image types using xloadimage for X-terminals.
-
-12-1-92
-Added gopher binary file types
diff --git a/docs/CHANGES2.4 b/docs/CHANGES2.4
deleted file mode 100644
index 19221e36..00000000
--- a/docs/CHANGES2.4
+++ /dev/null
@@ -1,891 +0,0 @@
---- Rename of Lynx2-3-FM and release as Lynx2-4  (08-June-1995) ---
-==============================================================================
-06-08-95
-* All of the changes from lynx2-3-FM are now located at ftp2.cc.ukans.edu.
-  We will call this version lynx2-4 and all new changes will be added here.
-  - JP
-06-05-95
-* Added isc support based on post to lynx-dev from Ami Fischman
-  (a540ami@pic.ucla.edu). - FM
-06-04-95
-* Initialize t1->name before the StrAllocCopy() in LYMainLoop.c for
-  DIRED_SUPPORT tagging. - Rick Mallett (rmallett@ccs.carleton.ca)
-* Don't bother creating a /tmp copy of local files for downloading
-  under the DIRED_SUPPORT, and don't include "Save to disk" in the
-  download menu for such files. - RM
-* Deal with any newlines or tabs in statusline messages, along lines
-  in patch from Peter Marquardt. - FM
-* Various fixes to ensure terminations of strings, along lines suggested
-  by PM. - FM
-* Made HTAlert messages more readable in trace mode.
-* Replaced info.cern.ch with www.w3.org in userdefs.h and lynx.cfg. - GL
-* Allow definition of the global configuration file (lynx.cfg) path and
-  name via a "LYNX_CFG" VMS logical or Unix environment variable.  Will
-  override the "LYNX_CFG_FILE" definition in userdefs.h.  The -cfg command
-  line switch will override those.  SYS$LOGIN (VMS) or '~' (Unix) can be
-  used in the path to treat the global configuration file as a personal
-  configuration file ($HOME will be substituted for '~'). Meets objective
-  in patch posted by Danny Meyer (mayer@ljsrv2.enet.dec.com) but does
-  not seek lynx.cfg in the user's HOME directory without an explicit
-  directive to do so.  Issue a screen message and then exit if the
-  configuration file is not readeable (rather than continuing as if
-  one had been found and read). - FM
-* Added protections from NAMEless INPUT or TEXTAREA tags. - FM
-05-29-95
-* Changed close(*s) typo in HTTCP.c to NETCLOSE(*s).  Caused tight loops if
-  on error *s became stdin. - Peter_Marquardt (wwwutz@cha01.tfh-berlin.de)
-05-20-95
-* Mods of proxying/gatewaying code, replace obsolete info.cern.ch default
-  URL addresses with www.w3.org, and add option to use the new www.w3.org
-  wais search gateway in cover page for wais searches. - FM
-05-10-95
-* If a startfile specified on the command line maps to a MIME type
-  which invokes an alternate display device, allow -homepage, if also
-  specified, to be substituted for startfile on quiting from the display
-  device, rather than forcing an exit due to the original startfile having
-  been neither text/html nor text/plain.  Based on a patch from GL, with
-  protections against possible infinite getfile() loops added. - FM
-* Include -t switch when pico is the editor for reply_by_mail() in
-  LYMail.c. - GL
-05-04-95
-* Oops.  Had zipped the wrong LYReadCFG.c in yesterday's mods. - FM
-05-03-95
-* Do not override any external proxy and no_proxy variables with those
-  in lynx.cfg.  Bug fixes in code for setting proxy variables on Unix,
-  based on patches from Roman Czyborra (czyborra@cs.tu-berlin.de). - FM
-* Fixes for tagging when Lynx jumps to another screen and then comes back,
-  and deal with possibility of screen outputs from compress/decompress
-  utilities. - GL
-* Added support for Sequent's DYNIX/ptx operating system, and bug fixes
-  in HTTCP.c's BSDselect(). - Rodney Barnett (RBarnett@us.teltech.com)
-* Increased limits in select() loops to 5000 tries. - FM
-* Specify /nomember for compilations with DECC.  It's not the default
-  on AXP and the code assumes byte alignment. - FM
-04-19-95
-* Added Alan Hirsh's script (LynxDir:VMSPrint.com) for dealing with busy
-  VMS print queues such that Lynx might otherwise delete the temporary
-  file before it has been queued for printing. - FM
-* Added lots of type casting to the mathematical operations in GridText.c
-  to minimize possible sizing/alignment problems for DECC/AXP (and any
-  Unix flavors that use the Alpha chip). - FM
-04-17-95
-* Use  test=test -z "$LYNX_VERSION"  like  test=test -n "$LYNX_VERSION"
-  in mailcap files simply as flags for non-LYNX versus LYNX environment,
-  without actually bothering to execute a test. - FM
-* Issue "** Bad HTML!!!  Use -trace to diagnose. **" statusline messages
-  when bad HTML is encountered, and suppress those statusline messages in
-  favor of the TRACE messages when -trace is used. - FM
-* Fixed anchor deletion problem in yesterday's ISMAP mods. - FM
-* Removed -ltermcap from AIX makes (AIX doesn't use it). - FM
-04-16-95
-* Send a 0,0 coordinate pair if a user clicks on an ISMAP link, so that
-  it's handled equivalently to clicks on an ISMAP submit button, and
-  (typically) will return the server's default.  Note that the default
-  often is the parent document, and if so, the current document will
-  be returned via redirection (pointlessly 8-).  However, this mod
-  allows the WebMaster to use a pure-text document as the default for
-  Lynx. - FM
-* Protections against crashes for inappropriately positioned form tags. - FM
-* Fixes in handling of configurable INEWS path. - FM
-* Support for VT500 series terminals. - George Cook (cook@wvnvaxa.wvnet.edu)
-04-12-95
-* Makefile tweaks for bsdi and aix4. - FM
-04-11-95
-* Mods for building with BSD Interative (bsdi). - FM
-04-08-95
-* Added translation of HTML entities and decimal escaping for the
-  VALUEs of INPUT and OPTION tags. - FM
-* For TYPE="image" INPUT tags, use "[IMAGE]-Submit" as a pseudo-ALT
-  string, and submit a 0,0 coordinate pair if it's clicked, which
-  typically will invoke the server's default (I guess something is
-  better than nothing. 8-). - FM
-* Handle (possibly multiple) angle brackets in bookmark and showinfo
-  link names. - FM
-* Fixed typo in for-ultrix code in LYMain.c. - FM
-04-04-95
-* Added ability to set proxy environment variables via lynx.cfg. - FM
-04-01-95
-* Added handling of the HTML 3.0 attributes for ISINDEX tags:
-      ISINDEX HREF="reference" PROMPT="string"
-  The ACTION attribute didn't make it into HTML 2.0.  For now, we'll keep
-  supporting it in Lynx by treating it as a synonym for HREF. - FM
-03-31-95
-* Mods for AIX v4.1.1 and addition of make aix4. - FM
-* Added prototype and extern declarations for BSDselect(). - FM
-* Fixed bugs in form_getstr() that could clobber the stack. - GL
-* Fixes for symlink handling. - GL
-* Made LYShowInfo.c aware of the setuid, setgid and sticky file modes,
-  and nicer mode display if the file doesn't have the read bit set. - GL
-03-30-95
-* Fixed glitch in BASE tag handling. - FM
-03-29-95
-* Initialize pointers in add_trusted() of LYGetFile.c before the
-  StrAllocCopy() calls. - FM
-03-26-95
-* Miscellaneous TRACE and related messaging tweaks. - FM
-03-24-95
-* Handle defaulted localhost in file BASE tags, and related tweaks of
-  defaulted localhost handling in file URLs. - FM
-* Use RM_PATH for both file and directory deletions with the DIRED_SUPPORT
-  remove function. - GL
---- STARTING  2.3-FM ---
-==============================================================================
-03-23-95
-* Designate this code set as lynx2-3-FM to avoid any confusion with the
-  official releases at UKans. - FM
-* Tweaks of code for defaulted localhost in file URLs.  Don't require
-  any host field marker in such URLs - FM
-03-21-95
-* Added handling of defaulted localhost in file URLs. - FM
-* More protections against bad HTML. - FM
-* SYSLOGing enhancements. - GL
-* Suspend curses during my_spawn()'s, and fixes of code for the child
-  and error return detection. - GL
-03-20-95
-* More protections against potentially infinite loops. - FM
-03-16-95
-* Enhancements of 'c'omment and mailto handling. - FM
-* Mods to build.com for enabling submission to BATCH. - FM
-* Ultrix terminal-handling fix. - Roman Czyborra (czyborra@cs.tu-berlin.de)
-03-15-95
-* Fixed bug in for-Unix directory listing code to screen out inaccessible
-  parent directories.  Was also being applied to ftp listings. - FM
-* Made bolding of H1 through H7 headers a lynx.cfg option, with the
-  non-bolding as the compilation default. - FM
-03-13-95
-* Fixed bug in setting link[].lname elements to empty strings for form
-  INPUT_ANCHORs.  Was causing showinfo() to report the links from the
-  previous document (yet another memory leak bites the dust 8-). - FM
-* Numerous fixups of bold and underline handling. - FM
-03-09-95
-* Increased the while() loop limit for select() tries in HTTCP.c to 500. - FM
-* Memory allocation/free fixes in HTAccess.c. - FM
-* Makefile and documentation tweaks. - FM
-03-07-95
-* Implemented HT_BOLD when specified for headers in DefaultStyle.c.  H1 is
-  now uppercase, bold, and centered.  H2 - H7 are lower or mixed case, bold,
-  and progressively indented. - FM
-* Miscellaneous enhancements of menu displays. - FM
-* Allow tabs and '$' in lynxexec commands. - FM
-* More TOUPPER/TOLOWER fixes. - FM
-03-06-95
-* Added ability to set the INEWS path in lynx.cfg. - FM
-03-05-95
-* Separated the newspost URL into newspost versus newsreply, and modified
-  LYNews.c to behave more rationally for new versus followup posting. - FM
-* Added "mode reader" command for news list and article requests. - FM
-* Enabled saving of list_dir_style settings in the user's RC file. - FM
-* Don't restrict rearming SIGINT in LYClean.c for IGNORE_CTRL_C to just
-  SVR4. - FM
-* Added numerous protections against core_dumps/ACCVIOs in HTML.c for bad
-  HTML.  Should also help reduce likelihood of infinite while() loops and
-  a runaway CPU if binary files are mistyped and rendering is attempted. - FM
-* Added (unsigned char) type casts in addch() calls for proper handling of
-  high value ISOLATIN1 characters. - FM
-* Limited the while() loop for select()'s in HTTCP.c to 50 tries, to help
-  reduce likelyhood of a runaway CPU on undetected terminal disconnects. - FM
-* Fixed typo in build.com. - FM
-* Added Craig's lynx_help and about_lynx files for the lynx2-3-7 distribution,
-  updated for lynx2-3-9 BETA. - FM
---- STARTING  2.3.9 BETA ---
-==============================================================================
-02-20-95
-* Updated doc files and passed on to UKans for archiving on the
-  ftp2.cc.ukans.edu server as 2.3.8 BETA. - FM
-02-17-95
-* Further updates of building procedures for VMS. - FM
-* Further updates of lynx.man, lynx.hlp and documentation.  Indicate
-  that the inside_foo and outside_foo restrictions are not selective
-  on systems which lack utmp. - FM
-* Changed yesterday's DGUX define fo DGUX_OLD, because only older
-  Data General systems need it. - FM
-02-16-95
-* Added Jeff's updates of lynx.man and lynx.hlp, further updated for
-  v2.3.8 - FM
-* Fixed typos in LYMail.c and HTTPC.c. - FM
-* Cleaned up #ifdef'ing for -DIGNORE_CTRL_C. - FM
-* Added -DDGUX for using inet_addr(host).s_addr instead of inet_addr(host)
-  in HTParseInet() of HTTCP.c (Data General may need it). - FM
-* Don't report "-help" as an invalid option. - FM
-02-15-95
-* Handle HTML entities and decimal escaping in ALT strings. - FM
-* Build fixups for TCPWARE. - FM
-02-14-95
-* Added transmission of Accept-Language headers.  A default preferred
-  language is defined in userdefs.h.  It can be overridden via lynx.cfg.
-  Users can change that via the 'o'ptions menu and save their preference
-  in their RC file. - FM
-* Tweak of FIXED record handling on VMS. - FM
-* Defined Unix ZIP_PATH and UNZIP_PATH in userdefs.h. - FM
-02-12-95
-* Added  -localhost  switch for restricting access to files and servers
-  on the local host. - FM
-* Added  -nobrowse   switch for disabling directory browsing. - FM
-* Added  -selective  switch for requiring a .www_browsable file in
-  each directory for browsing access to it.  The enabling files
-  are not included in the directory listings. - FM
-* Fixed up displaying of README files in directory listings on
-  VMS. - FM
-* Replaced all tolower() and toupper() calls with the TOUPPER() and
-  TOLOWER() macros in HTUtils.h (should help deal with some of the
-  strange behavior reported for some flavors of Unix; see header of
-  HTUtils.h). - FM
-Worked in mods from David Trueman (david@cs.dal.ca) - FM:
-* Don't issue the ../ link in Unix local directory listings if the parent
-  directory is not readable (was already dealt with on VMS - FM).
-* Include an Organization: header in Unix news postings, if possible
-  (was already dealt with on VMS - FM).
-* Don't allow the editing of Unix mail headers because that is error
-  prone (no change on VMS; editable pseudo-headers are included for
-  informational purposes, but the real headers are those of the
-  account running Lynx - FM).
-* Don't hardcode the Unix mv command; use MV_PATH define in userdefs.h.
-* Moved the Unix COPY_COMAND define to userdefs.h as COPY_PATH.
-* Completed the Unix ZIP support.
-02-10-95
-* Added code for converting the headers of downloaded binaries on VMS
-  to indicate FIXED 512 record format.  See the documentation in
-  userdefs.h, lynx.cfg and FIXED512.COM for more information. - FM
-02-08-95
-* Fixed glitch in HTInit.c which mis-casted the default MIME type for
-  files with a .sh extension, causing the EXEC_SCRIPT function to be
-  disfunctional. - FM
-* I think I finally have Lynx showing "(p# of N)" properly in the title
-  lines (we'll see if perfection has really been achieved 8-). - FM
-* Extended directory browsing on VMS to the -homepage specification,
-  if included on the command line, e.g., lynx -homepage=sys$login
-  will start up Lynx with the default startfile, but the 'm'ain menu
-  command will yield listings of the home directory. - FM
-* Added -fileversions switch on VMS for including all versions of files
-  in directory browser listings (otherwise, only the highest version is
-  listed, with no version numbers displayed). - FM
-* Modified LYEdit.c to use fopen(filename,"a") instead of access(filename,2)
-  to verify write access for editing files (checking "append" access appears
-  to be a more reliable way to do it across platforms/flavors). - FM
-02-07-95
-* Implemented directory browsing for VMS. - FM
-* Fixed printer command handling to actually prompt for and use a second
-  filename argument if two "%s" strings are in the command map. - FM
-* Added anti-Unix-shell-spoofing code for all of the filename argument
-  handling. - FM
-* Fixed glitch in getenv(DISPLAY) calls on VMS.
-02-04-95
-* Fixed a glitch in BASE support.  Should now work properly when both
-  standard and Lynx-specific hrefs are in the document. - FM
-02-03-95
-* Added support for posting to newsgroups from Lynx on VMS via the
-  ANU-NEWS software. - FM
-* Numerous href parsing enhancements. - FM
-* Enhancements and bug fixes of news displays. - FM
-* Enabled display of Linknames with angle brackets (as for news URLs)
-  in the showinfo page. - FM
-* Ensured that a file URL which is really an ftp URL will yield an
-  "FTP is Disabled" statusline message when it's disabled. - FM
-02-01-95
-* Defined out the LYK_VERSION code and made Control-V a dead key again,
-  since including the Lynx name and version strings in the showinfo ('=')
-  and 'o'ptions displays is adequate, and people on different platforms
-  or flavors associate Control-V with other functions. - FM
-01-31-95
-* Beefed up the BASE support. - FM
-* Made all WWWLib cover pages and menus HTTP/1.0 compliant (to ensure
-  resetting of any BASE tags) and gave them more pizzaz. - FM
-* Trim terminal slashes in ftp paths if not the Welcome directory, so
-  we'll get "Up to" links.  Terminal slashes in file paths still force
-  that directory to be treated as the Welcome directory.  For example,
-   ftp://host/blah/foo/ will have an "Up to blah" link listed, but
-  file://host/blah/foo/ will treat /blah/foo/ as "Welcome" (both ftp
-  and file "Up to" links are blocked by -DNO_PARENT_DIR_REFERENCE). - FM
-* The VMS SOCKETSHR_TCP support can't yet handle telnet, tn3270 or
-  rlogin URL's (Andy Harper is working on it; be patient 8-).  Modified
-  HTTelnet.c to compile properly and behave rationally when such URL's
-  aren't supported. - FM
-* Corrected doc files based on Larry Virden's (lvirden@cas.org) careful
-  (or is it carefull) proof-reading.  Thanks Larry! - FM
-* More type casts for ANSI C compliance. - FM
-01-30-95
-* Added numerous type casts for ANSI C compliance. - FM
-01-29-95
-* Prototyped HTHostName() for yesterday's mods in HTAccess.c. - FM
-* Updated lynx.cfg. - FM
-01-28-95
-* Added lynx name and version to the showinfo page and options menu. - FM
-* Tweaked Danny's news proxying mods for selective no_proxy directives
-  with a port field (119) for news, and added equivalent code for wais
-  (port 210). - FM
-* Updated the INSTALLATION file (I hope people read it 8-). - FM
-* Hadn't included last night's typo fix in the archived fileset. - FM
-01-27-95
-* Added Danny Mayer's (mayer@ljo.dec.com) mods for proper handling of
-  no_proxy directives for news (NNTPSERVER) hosts. - FM
-* Worked in Ari Luotonen's (luotonen@dxcern.cern.ch) mods for sending
-  a "Pragma: no-cache" header for use by a proxy server in conjunction
-  with the RELOAD command. - FM
-* Fixed to handle file URL's appropriately in conjunction with proxying
-  of ftp URL's.  For file URL's on the local host, direct access is
-  attempted, with no ftp attempt if that fails, whether or not proxying
-  is in effect, and whether or not no_proxy directives have been set.
-  Both ftp URL's, and file URL's on a remote host, are sought via ftp
-  without a direct access attempt.  File URL's for remote hosts are
-  converted to ftp URL's before submission to a proxy server, so no
-  special procedure need be implemented to induce the proxy server to
-  act on them (You shouldn't continue using file URL's when you intend
-  ftp, but Lynx will handle such URL's properly when encountered in
-  old documents that use file when ftp is intended.) - FM
-* Fixed typo in yesterday's "psychotherapy". - FM
-01-26-95
-* Escaping of ISINDEX queries needed more tweaks to work properly with
-  high value IsoLatin1 characters. - FM
-* Applied psychotherapy to the schizophrenic behavior that was exhibited
-  when download, upload, print, history or showinfo commands were used
-  during displays of each other's menus or temporary files. - FM
-* Enabled downloading of links from the history page. - FM
-01-25-95
-* Added LYK_VERSION command (^V) for showing version of Lynx. - FM
-* Include file fixes for TCPWARE. - FM
-* Fixed bug in showinfo() which caused core dumps when invoked while
-  positioned on any form field which has a "linkname" but a NULL
-  "filename". - FM
-* Fixed glitch in 'p'rint menu. - FM
-01-24-95
-* Enabled SOCKSification for any Unix flavor via the SITE-LYDEFS,
-  SITE-DEFS and SOCKSLIB definitions in the top-level Makefile.  Added
-  info in INSTALLATION on how to do it for VMS.  Included notes that you
-  are better off building Lynx normally, and instead using a SOCKSified
-  proxy server to get through a firewall. - FM
-* Added instructions in INSTALLATION for setting up proxy service. - FM
-* Fixed multiple submit button handling to distiguish which button was
-  activated when they have the same name, and include only that button's
-  name/value pair in the submission. - FM
-* Figured out how to apply all security and restrictions checks for
-  redirecting URLs returned by ISINDEX searches, and accordingly lifted
-  the bypasses for the previously insecure access types. - FM
-* Added option to use Jerry Whelan's (guru@bradley.edu) BSDselect() for
-  SVR4 systems with the "type any key" problem. - FM
-01-23-95
-* Fixed up escaping of queries in HTSearch(). - FM
-* Updated the sample jumps files. - FM
-* Worked in socksification mods from Reese Ferry (reesef@VNET.IBM.COM) - FM
-* Enabled use of LOCALE for international characters with any Unix flavor
-  (not just sun) via a define in the top level Makefile. - FM
-01-22-95
-* Updated the lynx.cfg configuration file. - FM
-* Implemented BASE handling. - FM
-01-21-95
-* Fixed -cfg switch handling so that the specified, alternate configuration
-  file properly is read instead of the default system file specified in
-  userdefs.h. - FM
-* Made 'p'rint, 'd'ownload and 'u'pload menu lists single spaced. - FM
-* Fixed HTFileFormat() in HTFile.c so that it properly processes the
-  suffix-to-MIME-type mappings when version numbers are in local file
-  URLs on VMS.  We therefore no longer trim off the version number if
-  if was included, and Lynx will now access and process that version
-  rather than only the highest version. - FM
-01-18-95
-* Makefile fixes for convex and linux. - FM
-01-17-95
-* More Makefile fixes. - FM
-01-14-95
-* Fixes for FreeBSD. - FM
-01-12-95
-* Made the "ls -l" emulation in local directory listings a compilation
-  option (see the top level Makefile). - FM
-* Made inclusion of "Up to" parent links in local directory listings a
-  compilation option (see top level Makefile). - FM
-* Message fix for checkmail on Unix. - FM
-* Fixes for SCO with gcc. - FM
-01-11-95
-* Restored original hash table function in HTAnchor.c without (hopefully 8-)
-  reviving anchor deletion problems. - FM
-* Fixed typo in HTAccess.c. - FM
-* Added code in HTFile.c from Timothy Newsham (newsham@aloha.net) for
-  generating long style Unix listings (ls -l). - FM
-01-10-95
-* Escape dashes in lynx.man. - FM
-* Added NetBSD support from Bryan T. Vold (btv@wiley.HealthPartners.COM). - FM
-* Made anchor searches in hash tables case-sensitive (so paths which
-  differ only in their case can be distinguished, as people using the
-  DIRED support kept requesting) without (hopefully 8-) reviving anchor
-  deletion problems. - FM
-01-09-95
-* More Makefile and code fixes for building properly with various systems
-  and compilers. - FM
-01-06-95
-* Numerous fixes for handling signals (e.g., SIGWINCH) received during
-  keystroke fetches, without (hopefully 8-) reviving the problem of
-  runaway CPU's on undetected terminal disconnects. - FM
-* More Makefile and code fixes for building properly with various systems
-  and compilers. - FM
-01-05-95
-* Changed define for syslog() logging to SYSLOG_REQUESTED_URLS and picked up
-  logging of ISINDEX search requests that don't go through getfile(). - FM
-* More fixes for redirection returned via ISINDEX searches. - FM
-* Fixed missing newline character at end of last .lynxrc entry. - FM
-* More Makefile tweaks. - FM
-* More additions in LYCurses.h for compilers which fail to check whether TRUE
-  and FALSE are already defined before defining them in curses.h. - FM
-01-03-95
-* Fix for redirection returned via ISINDEX searches. - FM
-12-29-94
-* Yet more top level Makefile tweaks. - FM
-* Fix bcopy problem for UCX. - Martin Zinser (zinser@vscn.gsi.de)
-* Fix ioctl() problem for UCX. - MZ
-12-27-94
-* More top level Makefile tweaks. - FM
-12-26-94
-* Added Lou Montulli's procedure for PURIFY to the top level Makefile. - FM
-12-23-94
-* Added Lou Montulli's memory leak fixes. - FM
-* Fixed HTLoadedDocumentTitle() call in LYGetFile.c. - FM
---- RELEASE of 2.3.8 BETA ---
-12-22-94
-* The WFEB code as of 12-15-94 has been archived at UKans as lynx2-3-7,
-  so we'll make this lynx2-3-8 to avoid confusion. - FM
-* Added bookmark_exec restriction for disallowing use of lynxexec URL's
-  in the user's bookmark file or converted Mosaic hotlist. - FM
-* Enable any lynxexec URL in JUMPFILE if EXEC_LINKS has been defined.
-  This allows you to set both LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE
-  to TRUE and a single TRUSTED_EXEC rule that will always fail (e.g.,
-  TRUSTED_EXEC:none), so that *ONLY* the lynxexec URL's in the jumps
-  file will be acted upon. - FM
-* Disallow lynxexec URL's in G)oto if no_shell is set or if
-  LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE is TRUE. - FM
-12-21-94
-* Include LYFLAGS in the BSDI_Makefile. - FM
-* Numerous mods based on patches from David Trueman - FM:
-* Changed SUN4 ifdef for implementing the "reverse clear screen hack" to
-  REVERSE_CLEAR_SCREEN_PROBLEM since not all sun4 systems experience this
-  problem.
-* Changed a few messages to use key_for_func() instead of a hard-coded
-  key mapping.
-* Allow control-C as well as control-G to abort or cancel on Unix (as
-  already on VMS).  On VMS, control-C and control-Y evoke a "Do you really
-  want to quit?" prompt, and a 'n'o reply gets handled as if control-G
-  has been entered in the first place.  On Unix, control-C is treated
-  simply as a synonym for control-G, and control-Y is not an interrupt
-  signal.  This seems the best way to handle those control signals, based
-  on what VMSers versus Unixites would expect them to do.
-* Added code to disallow the writing of files beginning with a dot if
-  NO_DOT_FILES is set TRUE in userdefs.h and/or lynx.cfg.
-* Added possibility of logging URL access via syslog() on Unix (ifdef'd
-  with LOGGING).
-* Improved and made more flexible the security for lynxexec URL's.  The
-  default behaviour is the same as now, but source locations and the path
-  (Unix) or name (VMS) of programs to be executed can be restricted via
-  TRUSTED_EXEC rules in the lynx.cfg file.
-* Convert ~ in lynxexec paths to $HOME on Unix.
-* Several changes in DIRED support.  Tidied and consolidated code.  Changed
-  the way tags are freed (fixing a bug where they did not always get cleared
-  properly).  Changed all programs to *_PATH defines.  Changed the display
-  of tags so they work with numbered links.
-* Added another restriction to disallow telnet port specifications in
-  G)oto URL's.
-* A bit of special case code in jump handling.  If key mapping is G, allow it
-  to be typed as "go target".
-* Change strncmp in remap() to strcmp() (bug fix).
-* Report offending bad option in main().
-* In mainloop(), make \r same as \t and \n.
-* Combine LYK_REMOVE code with LYK_DEL_BOOKMARK so that they can share the
-  same key map.
-* If show_cursor is true, position cursor 1 position before the link, which
-  makes it less likely that the link is obscured in defective terminal
-  programs
-12-15-94
-* More fixes in LYno_attr_char_case_strstr() and LYno_attr_char_strstr() - FM
-* People didn't like having to erase the default WHEREIS ('/') search string
-  when it wasn't what they wanted in a new document (though most didn't know
-  that it can be done easily via ^U), and Lynx doesn't have real editing via
-  LYgetstr() (just deletion from the end of the string), so I got rid of the
-  the editing offer.  The previous search string is still buffered across
-  document fetches, and can be used across documents via NEXT ('n').  You
-  also can use WHEREIS without a search string entry to turn off highlighting
-  within the current document, and then NEXT to restore it.  If control-G is
-  used instead of a blank string to cancel a WHEREIS command, it does not
-  turn off the highlighting.  So everything everyone asked for is now
-  possible (once you figure out how to do it 8-). - FM
-12-14-94
-* Oops!  Fixes in tcp.h for MULTINET with DECC/VAX had left SOCKET_ERRNO
-  undefined for all the other VMS TCPIP packages.  That's what I get for
-  working on this stuff too late at night. - FM
-* Additional ANSI compliance fixes in HTTCP.c for builds with DECC/VAX and
-  non-MULTINET VMS TCPIP packages. - FM
-12-13-94
-* Modified searches for strings within the currently displayed document
-  ('/', as opposed to 's' for ISINDEX searches) so that the highlighting of
-  the search string is not retained when the current document is changed,
-  and added recall buffering of the search string so that it's offered as
-  the default for editing or reuse on subsequent '/' commands.  Also, we
-  now force redraws on invokations of such searches so that hits will be
-  highlighted even if they occur on the current page.  Links with hits such
-  that they have embedded highlighting of the search strings will not have
-  the embedded highlighting restored when the cursor is moved onto and then
-  off of them (helps to distinguished whether it's intended or the due to
-  the search), but will be restored whenever the page is redrawn.  All
-  embedded highlighting also is restored when the 'n'ext command is used to
-  repeat the search in the current document, even if the returned hits do not
-  cause a page change.  Note that these searches first search only the links,
-  and position you on the first link with a hit occurring after the current
-  link.  If there were no hits in the links, then the text is searched and
-  the first hit occurring after the current link is positioned at the top of
-  the page.  They never did, and still do not, search both the link and text
-  portions of the document simultaneously.  Also note that ISINDEX searches
-  never have and still do not yield highlighting of the query string(s) in
-  the returned document.
-* Fixed LYno_attr_char_case_strstr() and LYno_attr_char_strstr() in
-  HTStrings.c so that they properly ignore any attribute characters in
-  the comparison string and return a pointer to the correct location
-  of a match with the target string. - FM
-12-12-94
-* Modified FTP gateway to display 230- as well as 250- information/help
-  messages, and on non-Unix as well as Unix systems. - FM
---- RELEASE of 2.3.7 BETA ---
-12-11-94
-* Further tweaked explanatory comments in the configuration and samples
-  files, and updated the instruction files. - FM
-12-09-94
-* Modifed PassesTest() in HTInit.c to avoid the overhead of system() calls
-  by using getenv() when   test -n "$DISPLAY"   and   test -z "$DISPLAY"
-  commands are encountered in the mailcap file.  Otherwise, needlessly
-  expensive system() calls potentially could be made for virtually every
-  viewer mapping in that file!.  For Lynx, those two strings in the mailcap
-  file now are equivalent to the :XWINDOWS and :NON_XWINDOWS flags,
-  respectively, for VIEWER: assignments in lynx.cfg. - FM
-* Also modified PassesTest() so that it simply treats  test -n "LYNX_VERSION"
-  as success.  Why spawn a system() command to see if Lynx is running, when
-  it obviously is!.  However, that string can be included in the mailcap
-  file for assignments that should be restricted to Lynx if other software
-  also uses the file. - FM
-* The above two mods make it unnecessary to actually use a "test" script for
-  differentially setting viewers in XWINDOWS versus NON_XWINDOWS environments,
-  so VMSers also can use the mailcap files for differential assigments of
-  viewers, without those DCL error messages about "test" which have been
-  mystifying so many people.  However, yesterday's mods do make it possible
-  for VMSers to use a "test" script for checking other environment or system
-  features, and thereby setting viewer switches differentially, analogously
-  to the command line switches for Lynx itself. - FM
-* Modified comments in samples/mailcap to indicate these enhancements. - FM
-* Modified comments in userdefs.h to describe correctly what the Lynx code
-  does as of v2.3:  Any SUFFIX or VIEWER mappings in lynx.cfg will be
-  overridden in src/HTInit.c if they also appear there.  Then, any mappings
-  in mime.type or mailcap will override those from lynx.cfg and src/HTInit.c.
-  The XLOADIMAGE definition is used in src/HTIinit.c, and you can use
-  mailcap, but not lynx.cfg, to override it. - FM
-* Modified comments in lynx.cfg and samples/lynx.cfg to indicate what Lynx
-  really does, and the use of mailcap files to do what lynx.cfg had claimed
-  it could do but doesn't. - FM
-* Fully implemented multiple submit button support for both POST and GET
-  forms. - FM
-* Added LYK_RESUBMIT keymap (with default binding to 'x' and 'X') for forcing
-  submissions of forms to servers (i.e., never use cache).  LYK_ACTIVATE
-  (with default binding to right-arrow and RETURN) still fetches from cache
-  if available.  Statusline help describes these commands when positioned
-  on a submit button. - FM
-12-08-94
-* Fixed HText_submitForm() in GridText.c to handle submitting INPUT types
-  (e.g., type="image") which have name/value pairs. - FM
-* Modified DCLspawn to recognize -1 on failure and 0 or 1 on success as
-  return or exit values of scripts, and report -1 or 0 as it's own return
-  value.  If a "test" script is used on VMS in conjunction with .mailcap
-  for setting viewers, it should return -1 if the test fails and 0 or 1 if
-  it passes (the "test" script can be DCL or an exectutable, and should be
-  defined as a foreign command).  If you don't have a "test" script, don't
-  include that instruction in .mailcap. - FM
-* The tmpaddress pointer in do_www_search() of GridText.c needed to be
-  initalized to NULL. - FM
-12-07-94
-* Made sufficiently ANSI compliant to build with DECC on VMS without using
-  the /stand=vaxc qualifier, and further modified so that Lynx will build
-  and run (extremely well 8-) with DECC/VAX.  Whooh, that took some doing!
-  These mods are also desireable for builds on Unix. - FM
-12-02-94
-* Fixed the query recall buffer in do_www_search() of GridText.c to restore
-  the +'s to spaces and unescape properly. - FM
-* Include file and define fix ups, for SOCKETSHR/NETLIB support and convex
-  builds, in tcp.h, LYShowInfo.c and top level Makefile. - FM
-11-27-94
-* Fixed bugs associated with failure to check the post_data element in
-  addition to the address element when making push/pop decisions for the
-  history stack, and when checking whether a requested document has been
-  loaded successfully.  The address element is insufficient for documents
-  returned by POST'ed forms. - FM
-* Check -trace switch earlier in LYMain.c so that trace messages associated
-  with setting up the Lynx configuration will actually be displayed. - GL
-11-23-94
-* More fix ups for the SOCKETSHR/NETLIB support.  Close to "all set" but needs
-  more field testing with the full range of TCPIP packages for VMS. - FM
-* Added HP_TERMINAL define for the DIM workaround to the REVERSE problem with
-  HP terminals.  If not defined, SNAKE builds will not make that substitution
-  (would be better to do this in a way that checks the terminal at run time,
-  but we'll hold off on that for now). - FM
---- RELEASE of 2.3.6 BETA ---
-11-21-94
-* Replaced ucx$inetdef.h with socketshr_library:ioctl.h for the
-  SOCKETSHR_TCP builds.  Note that the ioctl.h is not presently included
-  in the binary distribution of SOCKETSHR/NETLIB.  You have to get it from
-  the sources distribution. - FM
-11-18-94
-* Added Andy Harper's (A.Harper@bay.cc.kcl.ac.uk) "first round" support for
-  SOCKETSHR/NETLIB (see SOCKETSHR.ANNOUNCE).  Note that it is presently
-  including ucx$inetdef.h which is not provided with SOCKETSHR or NETLIB
-  source sets, and may not be available to non-UCX sites.  We're checking
-  into how to deal with that. - FM
-* Made recall buffering of shortcuts for the 'J'ump command a configuration
-  file option (in userdefs.h and/or lynx.cfg). - FM
-* Added clearerr() before the GetChar() in LYStrings.c. - FM
-* Made the optional novice help lines conform to the "standard default"
-  key bindings.  Edit them appropriately in userdefs.h if you plan to use
-  other bindings with that feature.
-* Added George Lindholm's (lindholm@ucs.ubc.ca) Makefile patch for making it
-  just a tad easier to set up local compile options. - FM
-* Eliminated serial free() in LYSanctify() of LYGetFile.c. - FM
-* Restricted all "hack to fix reverse clear screen problem" code to
-  SUN4 (had missed one 8-). - FM
-11-15-94
-* Eliminated separate list and atexit deletions of redirecting anchors. - FM
-* Added Rick Dyson's (Dyson@IowaSP.Physics.UIowa.EDU) updates of the
-  descrip.mms files. - FM
-11-12-94
-* Worked in Malcolm MacArthur's (mcscs2mm@zippy.dct.ac.uk) mods for reading
-  a printer's page length from the configuration file and calculating the
-  correct number of pages for the statusline query on whether to continue
-  if the document is longer than 4 printer pages.  Further modified that
-  code to use the current LYlines for the computation when the built in
-  "print to screen" option is selected.  See the comments concerning
-  "PRINTER:" definitions in lynx.cfg for more information. - FM
-* Fixed HTInetStatus() in HTTCP.c to use SOCKET_ERRNO instead of errno,
-  based on the platform/transport-specific definitions in tcp.h.  Thanks
-  to Danny Mayer (mayer@ljo.dec.com) for tracking down this glitch. - FM
-11-10-94
-* Added David Trueman's latest clever enhancement:  The command line option
-  -homepage=URL separates the notion of a home page (or main screen) from
-  the start file.  So,  lynx -homepage=URL1 URL2  will start up with URL2
-  but the MAIN_MENU key will take the user to URL1 rather than URL2.  This
-  is useful for public accounts that start up with an information page or
-  form, that then leads the user to a URL for the actual home page.  The
-  MAIN_MENU key can thereafter be used whenever the user wishes to return
-  to the actual home page. - FM
-* Enlarged string buffer in LYEdit.c to handle large paths. - FM
-* Made 'K'eymap title and descriptions easier to edit for alternate languages
-  (e.g., Dutch or Greek) as required by Dick Wesseling (but, alas, the editing
-  still has to be done in LYKeymap.c, because it's too much to move into
-  userdefs.h; someday Lynx will have real internationalization code 8-) - FM
-* Added titles to tops of jumps files so that the nesting level will be reset
-  on reloads. - FM
-11-09-94
-* More prototyping and include file fixes in LYJump.c and LYMainLoop.c - FM
-11-08-94
-* Prototyping fix in LYJump.c. - FM
-* Miscellaneous fixes in src/descrip.mms. - FM
-* Hadn't included patch for latest LYUtils.c in lynx2-3-5.patches. - FM
-11-07-94
-* At popular request (already 8-), changed the "Jump to:" query to work
-  exactly like the "goto:" query.  The previous entry is recalled, a '?'
-  must be entered explicitly to fetch the shortcut list (with an instruction
-  about that added to the prompt), and a blank entry or Control-G returns
-  the user to the current document. - FM
---- RELEASE of 2.3.5 BETA ---
-11-05-94
-* Numerous wonderful enhancements based on patches from David Trueman, and
-  entensions of those mods.  Briefly:
-* Implemented 'K'eymap command for showing all of the key bindings currently
-  in effect, with a description of their functions.  This is faster and
-  more helpful than the online help's description of the default key
-  bindings.  Must be uppercase 'K' if VI keys are ON, otherwise the command
-  is case-insensitive.  Try it, you'll love it! - FM
-* Implemented 'J'ump command for using "shortcut" names to access URL's in a
-  local "jumps.html" file that has a sorted DL list which maps each target
-  (shortcut) DT to it's full URL DD (see the sample jumps files added to
-  the distribution).  The URL's could be local or remote resources, or
-  lynxexec or launch file URL's for system utilities (e.g., the shortcut
-  "news" could invoke the news reader, "mail" the mail utility, "swing" the
-  VMS File/Directory Management Utility, etc.).  This feature is enabled by
-  defining JUMPFILE in userdefs.h or lynx.cfg, and can be disabled via at
-  run time via -restrictions=jump as a commandline switch.  Must be uppercase
-  'J' if VI keys are ON, otherwise the command is case-insensitive.  Try it,
-  you'll love this too! - FM
-* Added a CHECKMAIL symbol which if set TRUE in userdefs.h or lynx.cfg will
-  report the existance of unread mail at Lynx startup, and arrivals of new
-  mail, via statusline messages.  VMSers can block unsoliticed system NEWMAIL
-  screen broadcasts ($ SET BROADCAST/NOMAIL) when using this feature.  It
-  can be disabled at run time via the -restrictions=mail switch, which also
-  disables standard mail functions in Lynx, but still allows 'J'umps via a
-  "mail" shortcut to a lynxexec URL for a script which could perform security
-  functions before permitting or rejecting access to the mail utility.  The
-  hackers will really love this! - FM
-* Added ability to toggle the novice help line to show all of the principle
-  commands. - FM
-* Miscellanous bugs and memory leaks found and fixed in conjuction with
-  adding and enhancing the above features. - FM
-* The code may need some tweaking to build and run properly on some flavors
-  of Unix (appears to be all set for VMS). - FM
-11-01-94
-* Fixed bug if editor is dereferenced. - David Trueman (david@cs.dal.ca)
-* Enable alternate boxing of popup windows via defines for BOXVERT and
-  BOXHORI in userdefs.h - Dick Wesseling (ftu@fi.ruu.nl)
-* Check for LYCursesON before making any Curses calls in cleanup() - DW
-10-31-94
-* Looks like the last of the problems deleting anchors has been solved
-  by Dick Wasseling, so the bypass is lifted again. - FM
-* If CANT_EDIT_UNWRITABLE_FILES is defined on Unix, write access is
-  required to edit files (write and delete access are always required
-  on VMS). - Alex Whittaker (alex@biu.icnet.uk)
-* Moved "Press  RETURN ..." text to userdefs.h. - AW
-10-28-94
-* Uncache documents or bookmark file before reloads (via Control-R or
-  'r'emove command) in LYMainLoop.c. - FM
-* Uncache showinfo display or print, download, option, etc, menus before
-  reloading those in GridText.c. - Dick Wesseling (ftu@fi.ruu.nl)
-* Above two fixes still don't completely solve the anchor deletion problem,
-  so we're still bypassing.
-* Enable iso entity translations inside TITLEs - DW
-10-26-94
-* Problems when deleting anchors have been reported, apparently for
-  documents which have been (re)loaded with LYforce_no_cache.  So,
-  we'll retore the bypass until that problem is tracked down. - FM
-10-25-94
-* Added coded for disabling mail for -anonymous via CAN_ANONYMOUS_MAIL in
-  userdefs.h, and via -restrictions=mail (default is enabled). - FM
-10-21-94
-* Added Danny Mayer's (mayer@ljo.dec.com) samples/lynx.com - FM
-10-05-94
-* Modified tcp.h to deal with conflicting typedefing in the MultiNet
-  types.h and time.h versus those for DECC. - FM
-* Define FANCY_CURSES for linux-ncurses. - FM
-09-30-94
-* -restrictions help list in LYMain.c should indicate "option_save" (not
-  "options_save") for disabling the saving of options in .lynxrc. - FM
-09-29-94
-Mods based on patches from George Lindholm (lindholm@ucs.ubc.ca) - FM:
-* Fixed problem when IGNORE_CTRL_C is defined, that was created by the
-  fix for runaway processes on Unix when undetected terminal disconnects
-  occurred.
-* Added options to disable rlogin and/or ftp access.
-09-28-94
-* Use "hack to fix reverse clear screen problem" in GridText.c if SUN4 is
-  defined (still need clarification on the exact nature of the problem
-  to decide if this is the best way to handle it; it bothers me to have
-  this kind of hack in the code 8-) - FM
-Mods based on patches from George Lindholm (lindholm@ucs.ubc.ca) - FM:
-* Move the "quit" text to userdefs.h from LYMainLoop.c for easier
-  customization.
-* Typo fix for buttons submit value in GridText.c
-* Renable SIGINT signal for SVR4 machines if control-c is to be ignored
-  when editing.
-* Solaris fixes for LYCurses.h.
-* Recognize pico as a special editor.
-* Fix -restrictions help text.
-* Fix -telnet and -news options so that they actually do something.
-* Fix upload code so that you can have more than one uploader option,
-  and fix for freeing a static variable.
-* Various prototype fixes.
-* -editor command line option signals that the editor can't be changed.
-* Added a SYSTEM_EDITOR option to lynx.cfg for a locked editor.
---- RELEASE of 2.3.4 BETA ---
-09-27-94
-* Alas!  I think I've tracked down and fixed all the bugs that were causing
-  ACCVIOs/CoreDumps if anchors were deleted/freed when freeing the cached
-  documents.  So now we do delete/free them.  This plugs a major memory
-  leak in Lynx (which we knew about, but heretofore had to live with). - FM
-* Added Danny Mayer's (mayer@ljo.dec.com) fix so that MIME types are handled
-  case-insensitively. - FM
-* Restored text/html (WWW_HTML) as the default MIME type when an HTTP/1.0
-  server fails to send it in the headers.  This happens because it's the
-  default in Mosaic and developers using that don't realize their server or
-  script code is failing to send it (other MIME types will be caught as an
-  error, and the code will be fixed by the developers).  Garrett's change to
-  application/octet-stream (WWW_UNKNOWN) was technically correct.  You can
-  change it back to that where indicated in HTMIME.c if you prefer that Lynx
-  be technically correct but functionally wrong when dealing with this
-  situation. - FM
---- RELEASE of 2.3.3 BETA ---
-09-22-94
-* Finished up redirection handling.  Will now handle serial redirections
-  across multiple sites (with an arbitrary limit of 10, to prevent the
-  possibilily of an infinite loop of circular redirections), works properly
-  with redirections via the VALUE fields of OPTION tags, and no longer alters
-  any anchor addresses, avoiding all the problems that caused in the hash
-  table. - FM
-* Worked in Rick Mallett's (rmallett@ccs.carleton.ca) fix for runaway
-  processes on Unix when undetected terminal disconnects occur. - FM
-* Added Eric Jon Rostetter's (ERIC@uoft02.utoledo.edu) code for proper
-  keyboard handling with DEC eightbit terminals. - FM
-* Added David Greer's (david_greer@robelle.com) mods for curses on
-  HP terminals. - FM
---- RELEASE of 2.3.2 BETA ---
-09-17-94
-* More fix ups of forms structure handling, freeing and redirecting. - FM
-* Fixed problem with free's of startfile, thanks to Dick Wesseling
-  ftu@fi.ruu.nl - FM
-09-14-94
-* More memory leak and redirection fix ups (still not perfect). - FM
-* Various mods to speed up memory management with VAXC on VAXen (still
-  slow compared to DECC on AXPen). - FM
-09-13-94
-* If an ISINDEX document is one returned by a previous search, the 's'
-  command puts up the query which returned it, for editting as a new query
-  (use Control-U to erase, Control-G to abort)  Otherwise, no string is
-  offered in the prompt for a database query.  If the previous query is
-  submitted without modification, a message to use Control-R to resubmit
-  the same query is display (so that the search will not be repeated
-  inadvertantly). - FM
-09-12-94
-* Fixed failure to load the popped menu properly when a gopher search was
-  selected and a NULL string, Control-G, or arrow key is entered to cancel
-  the prompt for a query. - FM
-* Hit lists/documents returned by ISINDEX searches are now always displayed
-  at their tops.  They no longer inherit, inappropriately, the page and link
-  numbers of the previous list/document. - FM
-09-11-94
-* Fixed redirection handling so that the hash tables are updated and the
-  history stack works properly, including with forms that have VALUE
-  fields in OPTION tags that return Location: URL's for searches (e.g.,
-  the CUSI forms at Nexor).  Whew, that took some doing! - FM
-09-05-94
-* Fixed up remaining problems with OPTION VALUE="foo" handling and the
-  associated popup window positioning and scrolling. - FM
-* Fixed bugs and several inadequacies in the history structure and code
-  (still needs some redesigning to deal more effectively with all aspects
-  of documents returned by forms and/or redirection). - FM
-* Now deals properly with anchors in a single document returned by
-  a form. - FM
-* Command line file specs on VMS can now be any valid explicit, wildcarded,
-  partial, or relative VMS specification, and will be converted to a valid
-  file://localhost/ URL, so that partial or relative URL's within the file
-  also will be interpretted properly. - FM
-* Now trims trailing white space and won't get tripped up by '=' characters
-  when reading configuration files. - FM
-* Miscellaneous bug fixes and enhancements. - FM
-* Tracked down and eliminated more memory leaks. - FM
---- RELEASE of 2.3.1 BETA ---
-7-08-94
-* Correction handling of OPTION VALUE="" implemented.
-* Miscellaneous bugs corrected.
-6-17-94
-* Option to log memory leaks at exit by defining LY_FIND_LEAKS at compilation.
-6-17-94
-* Check amount of allocated memory, rather than just number of documents
-  cached, before deciding to remove the oldest document (implemented for
-  VMS with VAXC, not yet for Unix or VMS with DECC).
-6-16-94
-* VMS bookmark file version numbers are reset on additions of bookmarks.
-6-16-94
-* Gopher URL's with /hGET%20/ are converted to http URL's, as in the UMN
-  Unix/VMS gopher+ client.
-6-16-94
-* Added DIRECT_WAIS support for VMS
-6-16-94
-* Added build support for VMS TCPWare TCP/IP
-5-28-94
-* Increased nesting of HTML elements from 40 to 400.  Hopefully this will limit
-  won't be encountered often.
-5-28-94
-* Modified for handling of Telnet URLs with spaces/other characters in the
-  username.
-5-26-94
-* Began terminating memory leaks with extreme predjudice.
-5-24-94
-* WAIS searches will now work when they are of type "www/present" as opposed
-  to only viewing the source.
-5-23-94
-* Added VMS CMU TCP/IP support, thanks to Andy Harper.
---- RELEASE of 2.3 (19-May-1994, see CHANGES2-3) ---
diff --git a/docs/CHANGES2.5 b/docs/CHANGES2.5
deleted file mode 100644
index 6d2980ca..00000000
--- a/docs/CHANGES2.5
+++ /dev/null
@@ -1,1696 +0,0 @@
---- Rename of Lynx2-4-FM and release as Lynx2-5  (02-May-1996) ---
-==============================================================================
-05-02-96 ---- Release of Lynx2-5 ----
-* Modified documentation, help, and example files based on feedback for
-  yesterday's Lynx2-5 pre-release. - FM
-* Include ";q=0.001" whenever "iso8859-1" or "us-ascii" are autoappended
-  to Accept-charset headers. - FM
-* Added SITE_LIBS symbol in Makefile for convenient linking to any
-  site-specific libraries associated with any site-specific patches. - FM
-* Fixed an unsigned char typecast in GridText.c - FM
-* Eliminated statusline and TRACE warnings about possibly strange formatting
-  when TABLEs are in a document. - FM
-05-01-96
-* Renamed Lynx2-4-FM for pre-release as Lynx2-5
-04-30-96
-* Modified the fatal error messages such that they direct the user to
-  the local system administrator to confirm a bug before reporting it
-  to lynx-dev, and started updated the help and about files for the
-  switch to lynx-dev@sig.net as the primary list server. - FM
-04-28-96
-* Made use of ordered versus unordered lists and inclusion of article dates
-  in listings for news groups compilation and configuration options in
-  userdefs.h and lynx.cfg. - FM
-04-27-96
-* Added -realm switch for restricting URLs to the realm of the startfile.
-  The bookmark and jumps files are always considered as part of the realm.
-  Any execution links or form ACTIONs are permitted if obtained from
-  documents in the realm, but any switches that restrict bookmark operations
-  will still apply.  For example, -book -realm will use the bookmark file
-  as the startfile, and restrict URLs to files in the user's account.  Adding
-  -restrictions=bookmark_exec will block execution links in the bookmark
-  file, but not in other files within the realm (i.e., in the user's
-  account).  If the startfile is an http URL, the realm will be equivalent
-  to that in http authorization procedures.  Can be used with -traversal
-  for restricting the traversal to documents within the starting realm
-  for an http server. - FM
-* Fixed bug in form structure which could cause POST to be treated as
-  GET. - FM
-04-25-96
-* Added code to send Host: headers as described in the 23-Apr-96 HTTP/1.1
-  draft. - FM
-04-23-96
-* Modified HTMIME.c to pass documents with an ISO-8859-3 through -9, EUC-KR,
-  or ISO-2022-KR charset specified in the Content-Type header, to set the
-  flag for not doing 8-bit reverse translations, and to issue a statusline
-  message about the charset instead of forcing a download offer.  Will have
-  garbage in the displays of 8-bit characters if one doesn't have the
-  corresponding charset installed for the terminal, but no harm should be
-  done, and those who do can get the files displayed instead of just being
-  up the creek without a paddle.  Korean escape sequences will still be
-  trashed, since be have no translation functions as for Japanese, and we
-  still force a download offer if there is a mismatch for the supported
-  character sets, so the user can cancel and then modify the terminal setup
-  and charset choice appropriately. - FM
-* Increased the maximum number of attributes for tags (was too small for
-  OBJECT), updated the DTD for SCRIPT, and added the STYLE attribute for
-  all tags which presently, or might someday, accept it. - FM
-04-21-96
-* Modified the news gateway to use an ordered list with the numbers and
-  dates of the articles indicated in newsgroup listings. - FM
-* Fixed the checking and passing of the mailto argument in LYMainLoop.c
-  to mailmsg() in LYMail.c. - FM
-04-20-96
-* Fixed bugs in parsing of nntp and snews partial HREFs, and in the
-  parsing of NNTP message headers for creation of mailto and newspost
-  or newsrepy links. - FM
-04-19-96
-* Added OBJECT and BODYTEXT to the DTD, based on the 12-Apr-96 W3C draft.
-  The code for INSERT is still there, and should be remove if OBJECT
-  becomes a stable replacement.  Code to handle data URLs for OBJECTs
-  not yet attempted. - FM
-* More tweaks for Japanese character handling. - FM
-04-18-96
-* If LINKS_ARE_NUMBERED is on, include the list of references in the
-  outputs of 'p'rint menu options, analogously to the output with
-  -dump. - FM
-04-14-96
-* Mods to report the content of SCRIPT, STYLE and ALIAS blocks in trace
-  mode. - FM
-* Made &die;, &macr; and &trade; synonyms for &uml;, &hibar; and &reg;,
-  respectively. - FM
-* Fixed typo in second line link highlighting code for slang. - ES
-04-13-96
-* More tweaks of Japanese character handling. - FM
-* Reinitialize timeout values after select() calls in LYUtils.c. - ES
-04-12-96
-* More tweaks of Japanese character handling. - FM
-* Tweak of target line and link setting when toggling to image_links mode
-  in LYMainLoop.c. - FM
-* Tweaks of circular buffer handling based on analyses from Mike Castle
-  (mcastle@umr.edu) and Bryan T. Vold (btv@ldl.HealthPartners.COM). - FM
-* Fixed typo for NeXT in tcp.h, based on feedback from LWV - FM
-* Reinitialize timeout values after select() calls in HTTCP.c. - Erik
-  Sundkvist (ess@lysator.liu.se)
-04-11-96
-* More tweaks of Japanese character handling. - FM
-* Added code for handling charset mappings for file and ftp URLs. - FM
-  You can set the mappings via lynx.cfg (or mime.types), e.g.:
-  SUFFIX:.html8R:text/html; charset=KOI8-R
-  SUFFIX:.txt8R:text/plain; charset=KOI8-R
-* Tweak of charset handling in HTMIME.c - FM
-04-09-96
-* Modified news gateway to handle split header lines. - FM
-* Tweaks of authorization header handling to make failures due to bad
-  headers from the http server clear to the Lynx user. - FM
-04-08-96
-* Yet more tweaks of memory management. - FM
-04-07-96
-* Tweaks for handling Japanese received via gateways. - FM
-04-06-96
-* More memory management tweaks. - FM
-04-05-96
-* Updated lynx.man, lynx.hlp and the online help files. - FM
-* Tweaks of INPUT, TEXTAREA and SELECT popup OPTION handling when
-  Japanese character translations are on. - FM
-04-04-96
-* Created new zip.  Yesterday's appears to have been bad. - FM
-04-03-96
-* More optimizations and bug fixes based on patches from JED. - FM
-* More mods for handling keyboard input via SLANG library functions,
-  based on patches from JED.  Note that the code for IGNORE_CTRL_C
-  has been bypassed in those mods, as they presently stand. - FM
-04-02-96
-* Added "first pass" handling of P end tags. - FM
-* Mods of HTCheckForInterrupt() for SLANG, based on patches from JED.
-  Note that the for-SLANG code is not taking possible SOCKSification of
-  Lynx into account. - FM
-* Use 3 for ^C instead of 7 for ^G as the argument for the slang abort
-  key in calls to SLang_init_tty(). - JED
-* Tweaks of make for clix. - AM
-03-31-96
-* More tweaks of memory management. - FM
-03-30-96
-* Added support for Japanese translations of text/plain in addition to
-  text/html documents, and for ALTs and form fields (see 03-26-96 mods).
-  Needs checking.  Also added an LYK_JPN_TOGGLE, mapped to '@' by default,
-  for toggling JAPANESE mode ON and OFF, and code to indicate the situation
-  in the 'o'ptions menu. - FM
-* Added make for ultrix-slang and decstation-slang, and tweaks of LYCgi.c
-  for ultrix. - Alvian Tam (atm@newt.phys.unsw.edu.au)
-* Found and fixed some typos in yesterday's mods. - FM
-03-29-96
-* Added build-slang.com for building Lynx with the SLANG library instead
-  of curses on VMS. - FM
-* Mod to treat an EOF with errno of EINTR when GetChar() is defined as
-  getchar() in LYgetch() as due to a Ctrl-Z suspend, and invoke another
-  character fetch instead of exit on error.  Based on patch from Gregory
-  Neil Shapiro (gshapiro@WPI.EDU). - FM
-* Numerous optimizations and bug fixes based on patches from JED. - FM
-03-28-96
-* More tweaks of SLANG support. - FM
-* Yet more tweaks of the HTList functions and macros, and their associated
-  memory management. - FM
-03-27-96
-* Fixed bug which could cause a crash if links are numbered and you
-  activate a link via a number when there are no links on the currently
-  displayed page. - FM
-* Tweaks of Content-Encoding header handling, and more detailed messages
-  about it in trace mode. - FM
-03-26-96
-* Added code in HTMIME.c for taking into account Content-Encoding headers,
-  so that compressed text/html or text/plain files are not displayed
-  inappropriately based on their Content-Type. - FM
-* Added "first pass" support for Japanese character translations, based on
-  patches for Lynx2-4-1 by Takuya Asada (asada@icsd6.tj.chiba-u.ac.jp).  Is
-  to be checked out by Nelson Henry Eric (nelsonhe@ews07.nara.kindai.ac.jp)
-  because I have no way to check it here.  Translations can be made the
-  default behavior by setting JAPANESE to TRUE in userdefs.h and/or
-  lynx.cfg.  The default can be toggled via a "-jpn" command line switch.
-  If made TRUE by any means, the value of KANJI_CODE set in userdefs.h
-  and or lynx.cfg (EUC, SJIS, or NONE) will be applied, and can be changed
-  via "-euc", "-sjis" or "-ascii" command line switches, for setting Kanji
-  code translations to EUC, Shift JIS, or disabling it, respectively.  Note
-  that Japanese translations are not yet performed in the line editor
-  (LYgetstr() of LYStrings.c and form_getstr() of LYForms.c), for form
-  field values, or for gateways (let's first see if what I've done so far
-  works right 8-) - FM
-* Added "LY" prefix for pop(), pop_num() and push() function names to
-  avoid possible conflicts with the ncurses library functions, and fixed
-  continuation line typo in solaris2 make, based on feedback from PN. - FM
-03-23-96
-* Tweaks of memory management in the CSO/PH gateway. - FM
-* Tweaks of wait() versus waitpid() handling for NeXT, aix4 and mips,
-  based on feedback from PN. - FM
-03-22-96
-* Tweaks of SLANG support for Unix, and finished up code support for it on
-  VMS (but tested only with OpenVMS/AXP).  Haven't yet decided how to add
-  VMS build support for it in the COM and MMS files.  Get the SLANG library
-  code from ftp://space.mit.edu/pub/davis and then add USE_SLANG in the
-  DEFINE list and the path to it's headers in the INCLUDE list for the
-  compilation, and [path]slang.olb/lib in the link list immediately before
-  the OPT file.  We still need the curses library in the OPT file, because
-  that's not just curses functions on VMS and we're using ones not replaced
-  by the SLANG library (Try it, you'll like it! 8-). - FM
-* Tweaks for NeXT, based on feedback from Paul Nevai
-  (nevai@ops.mps.ohio-state.edu). - FM
-03-20-96
-* Tweaks of code for sorting directory listings by date (take into account
-  the 6-month-old time versus year rule on Unix). - FM
-* Tweaks of memory management for HTList-based buffers (use internal
-  allocations, instead of the libwww macros). - FM
-* Added solaris2-slang to Makefile, and tweaks of the sun4 makes. - LWV
-03-19-96
-* Tweak of MAP handling so that the ordered lists are displayed exactly
-  in the order of the resolved AREA tags.
-03-18-96
-* Added SLANG support (for colorized Lynx) based on patches from JED.
-  The make support is for linux and sun4, but it should be portable to
-  other Unix flavors.  I have it working on VMS, but the SLANG interrupt
-  and exit handlers are incompatible with the current ones for VMS in
-  Lynx (and with the VMS debugger), so I haven't yet included SLANG
-  support in build.com or the MMS files. - FM
-03-17-96
-* Tweaks of 'd'ownload menu handling on returns to it from a DOWNLOADER
-  action. - FM
-* Added various anti-crash protections and cleaner code from John E. Davis
-  (davis@space.mit.edu) for trimming trailing white space and finding
-  unescaped colons in LYReadCFG.c, and cleaned up and more fully commented
-  the functions and subfunctions in that and the LYMainLoop.c modules. - FM
-03-16-96
-* Fixed routine which sorts directory listings by date (based on 'o'ptions
-  menu setting) to do it accurately and in reverse chronological order. - FM
-03-15-96
-* Added code to create links for likely URLs in results returned by
-  the CSO/PH and finger gateways.  Try:
-   gopher://ns.bradley.edu:105/2   or:
-      cso://ns.bradley.edu/        and search for David Henderson.
-  Also try:
-   gopher://cegt201.bradley.edu:79/0/w%20davidh   or:
-   finger://cegt201.bradley.edu/w/davidh          as URL.s - FM
-* Added LYK_INTERRUPT handling for the CSO/PH and finger gateways, and
-  made their memory management more efficient. - FM
-* Made the my_spawn() function in LYLocal.c more portable by using
-  waitpid() instead of wait(). - FM
-* Restored the Lynx2-3 behavior of seeking the current position and link
-  on return from 'e'dit.  May be wrong if the file was modified, but it
-  might be in the right ball park, and nothing really bad will happen if
-  it's far off. - FM
-03-14-96
-* Added -reload switch for instructing Lynx to send "Pragma: no-cache" and
-  "Cache-Control: no-cache" headers when requesting the startfile from an
-  http server (doesn't apply to subsequent fetches, or to non-http startfile
-  URLs). - Peter Ekberg (peda@lysator.liu.se)
-* Put the correct LYMain.c, which declares no_change_exec_perms, in the zip
-  (second try, hope I really did 8-). - FM
-03-13-96
-* Yet more tweaks of the CSO/PH gateway. - FM
-* Yet more tweaks of the finger gateway. - FM
-03-12-96
-* Made the URL and command buffering in the finger gateway secure from stack
-  modifications, beautified the HTLoadFinger() and response() functions, and
-  added support for the following URL formats for sending a "", "/w",
-  "username", or "/w username" command to the finger server:
-     finger://host			   finger://@host
-     finger://host/			   finger://@host/
-     finger://host/%2fw			   finger://@host/w
-     finger://host/w                       finger://host/w/
-     finger://host/username[@host]	   finger://username@host
-     finger://host/username[@host]/	   finger://username@host/
-     finger://host/w/username[@host]	   finger://username@host/w
-     finger://host/%2fw%20username[@host]  finger://host/username[@host]/w
-* Replaced the _tolower macro in the CSO/PH gateway with TOLOWER. - FM
-* Tweaks of DIRED_SUPPORT.  Added NO_CHANGE_EXECUTE_PERMS compilation
-  symbol and change_exec_perms restrictions switch for restricting
-  changes of the eXecute permissions to directories, and not files,
-  when OK_PERMIT has been set. - Earl Fogel (fogel@duke.usask.ca) & FM
-* Added make support for Intergraph CLIX (note that some online help files
-  must be edited and renamed to meet this Unix flavor's 14 character file
-  name limit). - Alex Matulich (matuli_a@marlin.navsea.navy.mil)
-03-11-96
-* Added support for using finger://host/w/username to send "/w username"
-  to finger (port 79) servers. - FM
-* Tweaks of alignment handling to deal with (illegally) embedded CENTER
-  containers (typically due to omission of an end tag for the first
-  CENTER of the pair; ugh!). - FM
-03-10-96
-* Added form-based CSO/PH (port 105) gateway.  Can be invoked via a
-  cso://host[:port]/ or gopher://host[:port]/2 URL.  If the gopher
-  format is used and a query token is appended (?[query]), the old
-  ISINDEX-based gateway will be used. - FM
-03-07-96
-* Added NO_FROM_HEADER configuration symbol in lynx.cfg, and -nofrom
-  command line switch, for blocking all transmissions of From headers
-  by Lynx. - FM
-* Added NO_REFERER_HEADER configuration symbol in lynx.cfg, and -noreferer
-  command line switch, for blocking all transmissions of Referer headers
-  by Lynx. - FM
-* Enhancements of the 'o'ptions menu. - FM
-03-06-96
-* Restored the Lynx2-3 behavior of seeking the current document position
-  and link on (^R)eloads.  Will be wrong if the document is actually a
-  changing script output, or SSI with changes in the sizes of inserts,
-  and any form entries will be lost with no warning about that if no
-  form links are in the currently displayed page (and there may be other
-  glitches I don't remember any more).  However, it's correct, and more
-  convenient, most of the time, and nothing really bad will happen if
-  it's wrong. - FM
-03-05-96
-* Added SAVE_SPACE configuration symbol in lynx.cfg, and LYNX_SAVE_SPACE
-  environment variable (Unix) or logical (VMS) for setting a default path
-  prefix in suggested filenames in Save to Disk operations of the 'p'rint
-  and 'd'ownload menus.  If not set, only a filename will be suggested,
-  for saving in the current default directory.  See the INSTALLATION file
-  and lynx.cfg for more information. - FM
-03-02-96
-* If an IMG tag has both ISMAP and USEMAP attributes, create links for
-  both, and use the ALT string, if present, for the USEMAP link.  The
-  server-side script might have a content-rich default set up for non-GUI
-  clients, so we may as well be able to try it, and still have our own
-  USEMAP listing available if it's a site unconcerned about text and
-  braille clients, or GUI clients with image loading turned off. - FM
-* Tweaks of MAP code to maximize efficiency of fetching and processing
-  MAPs from a different document. - FM
-* Make sure the traversal code doesn't get tripped up by any HREFs
-  which contain newline characters due to misparsing (e.g., because a
-  close-double-quote wasn't present where required, and soft_dquotes
-  wasn't toggled ON, or invalid comments were present, and mimimal or
-  historical comment parsing weren't toggled ON). - FM
-* Renamed LYK_RESUBMIT ('x' or 'X') to LYK_NOCACHE and modified it's code
-  so that it applies to normal links as well as form submit buttons.  If
-  used instead of LYK_ACTIVATE, any HText cache from a previous submission
-  or request will be dumped, and the submission or request will be made
-  with the  "Pragma: no-cache"  and  "Cache-Control: no-cache"  headers
-  included, to ensure that a proxy/cache server also will not return a
-  cached copy (assuming it respects either of those headers). - FM
-03-01-96
-* Converted the client-side image MAP code to a protocol which returns
-  a stream, rather than using a temporary file.  This allows saving
-  the link as a bookmark, for fetching the MAP and creating a listing
-  without need to fetch and render the original document.  Also enabled
-  direct downloading of the MAP listing. - FM
-02-29-96
-* Added handling of client-side image MAPs.  If both USEMAP and ISMAP
-  attributes are present, the client-side MAP is used instead of the
-  the server-side script.  The MAPs can be in the same or different
-  documents.  The HREFs of the AREA tags are presented as a list,
-  with their ALTs (if present, otherwise their HREFs) as the link names
-  in the list.  Added a TITLE attribute for MAPs, which will be ignored
-  by GUI clients, but if present will be used by Lynx as an H1 for the
-  list (MAP NAME="welcomemap" TITLE="Welcome Map").  Otherwise, the
-  IMG's ALT (if present, otherwise "[USEMAP]") will be used as an H1
-  in the list.  The MAP's resolved URL also is shown in the list, since
-  the URL for the list is a temporary file. - FM
-02-25-96
-* Added a MINIMAL_COMMENTS configuration symbol, which if set TRUE in
-  lynx.cfg will emulate the Netscape v2.0 comment parsing bug of seeking
-  only a '-->' terminator, and not interpreting '--' pairs as serial
-  comments within the overall comment element.  The compilation default
-  is FALSE, but we'll set it TRUE in lynx.cfg until Netscape gets its
-  comment parsing right, and "decorative" dashes in comment elements
-  cease to be so common in "Enhance for Netscape" pages.  Also added
-  a '-minimal' command line switch for toggling the Mininal or Valid
-  configuration setting, and an LYK_MINIMAL command key toggle (mapped
-  by default to backquote).  Note that setting Historical comments on
-  will override the Minimal or Valid setting (i.e., any '>' will be
-  treated as the terminator of a comment element).  A statusline
-  message indicates whether Historical, Minimal or Valid comment
-  parsing has gone into effect when the LYK_MINIMAL or LYK_HISTORICAL
-  command key toggles are used (i.e., those two toggles in effect are
-  a "troggle"). - FM
-02-22-96
-* Tweak of HTList manipulations. - FM
-* Additions to the online help. - FM
-* Unescape any hex escaped username and/or password in ftp URLs. - FM
-02-20-96
-* Handle timeout disconnects of cached NNTP connections. - FM
-* Allow head or tail match specifications (e.g., comp.infosystems.*
-  or *.unix) in news, nntp and snews URLs (That's illegal, so don't
-  use it in public documents.). - FM
-* Tweak of bookmark handling. - Ismael Cordeiro (ismael@CAM.ORG)
-02-16-96
-* Tweak of the new code for setting a default CHECKED radio button. - FM
-02-15-96
-* Issue a sensible exit message if a non-http URL is used as the startfile
-  with -traversal. - FM
-* Tweaks of bookmark handling. - FM
-* Tweaks of Home_Dir() type casting. - FM
-02-14-96  Happy Valentine's Day!!!
-* Tweaks of charset conversions. - FM
-02-12-96
-* Made inclusion of Unix DIRED_SUPPORT the compilation default, and
-  its refinement easier to understand and set in the Makefile. - Will
-  Mengarini (seldon@eskimo.com) & FM
-* Changed (X) and ( ) to [X] and [ ] for indicating checked or unchecked
-  checkboxes.  For radio buttons, we still use (*) and ( ). - FM
-02-11-96
-* Distinguish checkboxes from radio buttons in the Lynx display by using
-  (X) versus (*), respectively, when they are checked or selected. - FM
-* Make the first radio button in a series with the same NAME checked by
-  default if none of them had CHECKED specified. - FM
-02-09-96
-* Added LYK_HISTORICAL and LYK_SOFT_DQUOTES, mapped by default to the
-  the single- and double-quote keys, respectively, for toggling valid
-  versus "historical" comment parsing, and valid versus "old Mosaic-
-  and Netscape-like" double-quote parsing. - FM
-* Added SCRIPT to the DTD and code to ensure that bad comments in its
-  content don't generate garbage in the display. - FM
-* Added -DSVR4 to the make for solaris2. - KH
-* Use copy instead of rename in descrip.mms for putting lynx.exe in the
-  top directory, as in build.com. - FM
-* Added TITLE attribute to FORM, and code to use it for the Subject in
-  mailto ACTIONs.  It's not in the spec, but better to offer it than
-  to settle into Netscape's ?subject=foo tack-on kludge which breaks
-  mailto for clients which haven't added code to cope with it. - FM
-02-08-96
-* Added -book switch for using the bookmark page as the startfile.  The
-  default or command line startfile will still be set for the 'm'ain screen
-  command, and be used as the startfile if the bookmark page is unavailable
-  or blank. - FM
-* Fixed glitch for Unix in yesterday's LYMail.c mods. - FM
-* Try graceful alternatives if getenv("HOME") returns NULL. - Kenneth Herron
-  (kherron@campus.mci.net) & FM
-02-07-96
-* Added support for the ?subject=foo tack-on kludge to specify the Subject
-  in mailto ACTIONs and HREFs. - FM
-* Convert Explorer's semi-colon Internet address separators to commas
-  before acting on mailto address lists on Unix or VMS. - FM
-* Made EMBED empty again (the W3C container version has been replaced
-  by INSERT, and Netscape still has it empty). - FM
-02-06-96
-* Tweaks of descrip.mms files for VMS. - FM
-02-04-96
-* Fixed caching of news/nntp connections so that we access the correct host
-  when more than one has been specified. - FM
-02-03-96
-* Added ndash and mdash to the entities conversion tables.  The W3C's
-  DTD specifies those, whereas the text descriptions say endash and
-  emdash, so we'll cover all the bases by supporting all four. - FM
-* Reduced the "en" metric for TAB to 2 per column.  Was 12, to be
-  compatible with UdiWWW, but that's pixels.  You can change the enval
-  initialization in HTML.c from 2 to 12 if you want the old behavior. - FM
-* Force use of DECC in build.com if that compiler is installed on VMS,
-  and make sure external logicals don't defeat a choice of DECC via
-  descrip.mms. - FM
-02-02-96
-* Mods to handle lone CRs as newlines when dislaying text/plain files
-  from MAC servers.  Note that they'll stay CRs when downloading, or
-  fetching with -source, but be handled as newlines when the '\' source
-  toggle is used for text/html files and their source is displayed as
-  text/plain. - FM
-01-31-96
-* Added dummy initializers in LYCharSets.c and LYEditmap.c to ensure the
-  modules are linked if the external model is common block and they are
-  placed in a library. - FM
-01-30-96
-* For submissions of forms with a mailto ACTION, allow the user to edit
-  the default Subject string (the TITLE of the document containing the
-  form) via a statusline prompt, or to cancel the submission via Ctrl-G
-  at the prompt, analogously to 'c'omments or for anchors with a mailto
-  HREF. - FM
-01-29-96
-* Typo fixes in HTML.c, LYJump.c and LYGetFile.c. - PM
-01-28-96
-* Tweaks of redirection handling. - FM
-01-27-96
-* Support use of the TITLE attribute for setting the Subject in LINKs with
-  REV="made" or REV="owner" and a mailto HREF, equivalently to its use
-  with anchors in the BODY. - FM
-* Always use the parent document's URL for X-URL in mailto anchors, but
-  still use mailto:address if it was entered as a 'g'oto. - FM
-* Improvements of the code in LYMainLoop.c for checking the types of
-  links (first make sure that there are links to check 8-). - FM
-01-26-96
-* Made LYCharSets.c an object module instead of header for HTML.c, and
-  created LYCharUtils.c with character-related functions from HTML.c,
-  to reduce the size of HTML.c (got a report of memory exhaustion when
-  trying to compile HTML.c). - FM
-* Added BGSOUND to the DTD and code for creating a link to the source
-  when clickable_images is set. - FM
-01-24-96
-* Tweak of URL resolving when http servers return the obsolete file URL
-  format for what are actually ftp URLs (as DEC's servers are doing). - FM
-* Added LYE_LOWER and LYE_UPPER for lower or upper casing lines with the
-  line editor.  Default bindings are Ctrl-K and Ctrl-T, respectively (not
-  "intuitive" but they're the only "safe" non-printing keys left 8-). - FM
-01-23-96
-* Yet more tweaks aimed at getting Lynx to compile across versions of
-  MultiNet through v3.5A and DECC through v5.2 or VAXC.  Pat Rankin
-  is trying to cope with this mess for compilations with MultiNet and
-  his VMS port of GNUC (cross your fingers 8-). - FM
-* Updates of the help and about files. - FM
-* Tweak of sendmail path for BSDI. - Bennett Todd (bet@ritz.mordor.com)
-01-22-96
-* More tweaks for dealing with header conflicts in MultiNet v3.5A with
-  DECC v5.2. - FM
-* Tweak of our kludge to append a 0,0 coordinate pair for ISMAP URLs. - FM
-* Tweaks of base handling in HTML.c. - FM
-01-20-96
-* Mods for builds with NetBSD, or MultiNet v3.5A with DECC v5.2 (they
-  have conficting headers). FM & PR
-01-18-96
-* Improved and corrected the fatal error messages. - FM
-01-17-96
-* Added ability to set the NNTPSERVER environment variable via lynx.cfg if
-  it has not been set externally (analogously to the proxy variables). - FM
-* Tweaks of proxy handling. - FM
-* Modifed the "Accept-Language: " header handling so that is uses the
-  "perferred document lang(G)uage" string without any modifications.
-  This allows the user to specify a comma-separated string with quality
-  values included, exactly to his/her requirements. - FM
-01-16-96
-* Modified the traversal code so that it always outputs to an error file if
-  requests fail or unknown statuses are received from the http server. - FM
-* Added target "sun4-ncurses" to the Makefile. - Bennett E. Todd
-  (bet@nyc.fcmc.com)
-* Tweaks of "preferred document lan(G)uage" and "preferred document c(H)arset"
-  'o'ptions handling.  Send only the preferrence or comma-separated list of
-  preferrences in the "Accept-Language: " and "Accept-Charset: " headers.
-  Append ", en" if "en" isn't present, and ", ISO-8859-1" and/or ", US-ASCII"
-  if those aren't present, rather than relying on servers to honor defaults,
-  but still don't send an "Accept-Charset: " header at all if no preference
-  has been specified by the user. - FM
-* Fixed typos in the about and help files. - FM
-01-15-96
-* Tweaks of bold and underline setting in split_line() of GritText.c. - FM
-* Fixed handling of FORM start tags with no ACTION specified. - FM
-* Tweaks of "IBM PC character set" and added "IBM PC codepage 850"
-  (ISO8859-1, see IBMPC-charsets.announce). - Mike Brown (mike@hyperreal.com)
-* Check in userdefs.h whether LYNX_CGF_FILE has been defined via the
-  Makefile, build.com or descrip.mms. - PG
-* Created CHANGES2-3 with changes through release of Lynx2-3 on 04-19-94,
-  and CHANGES2-4 with subsequent changes through the rename of lynx2-3-FM
-  to Lynx2-4 and its release on 06-18-95, and deleted those sections from
-  this file. - FM
-* Added the new Copyright and links to it in about_lynx.html. - FM
-01-11-96
-* Tweaks of HTWAIS.c for compatibility across versions of FreeWAIS. - FM
-* Unescape any hex escaped percents in mailto URLs and ACTIONs. - FM
-01-10-96
-* Added an LYCheckForProxyURL() function, and a PROXY_URL_TYPE return value
-  for is_url(), so that Lynx can proxy URLs with an unknown scheme if a
-  proxy for the scheme has been set, e.g., if "foo_proxy" has been set
-  to "http://host/", then "foo:blah", where "blah" may or may not begin
-  with a slash, will be handled as "http://host/foo:blah".  Components of
-  "blah" will be checked versus "no_proxy", if set, but since we don't
-  know the default port for scheme "foo", the checks for any ports
-  associated with the no_proxy values may not be reliable (but if we
-  don't proxy, nor know the scheme, nor find "foo:blah" as a local file,
-  the URL would fail, anyway)  - FM
-* Fixed typo in VMSPrint.com. - Paul Farnham (farnham@pasco.wednet.edu)
-01-06-96
-* Tweak of traversal code. - FM
-01-04-96
-* Tweak of dynamic SOCKS mods. - TZ
-01-03-96
-* Added circular recall buffers for JUMP shortcuts.  If multiple jumps
-  files are installed, each has it's own recall buffer.  If Lynx was built
-  with PERMIT_GOTO_FROM_JUMP defined, any random URLs accessed via the JUMP
-  command are placed in the goto circular buffer, not that for shortcuts,
-  and a JUMP entry of the single character ':' for the target is treated
-  as a command to invoke the circular buffer of previously resolved goto
-  URLs (as if 'g'oto followed by Up-Arrow were used). - FM
-* Added GOTOBUFFER, homologous to JUMPBUFFER, for specifying via userdefs.h
-  and/or lynx.cfg whether to offer the previous goto URL, if any, for
-  reuse or editing whenever the 'g'oto command is entered, or simply rely
-  on invoking the circular buffer via the Up-Arrow and Down-Arrow keys for
-  accessing previously resolved goto URLs. - FM
-* Tweak of 'g'oto recall buffering loop in LYMainLoop.c. - AH
-01-02-96
-* Added circular recall buffering for 'g'oto URLs.  Is invoked (if previous
-  URLs have been entered) via Up-Arrow or Down-Arrow after entering the
-  'g'oto command. - FM
-* Added circular recall buffering for WHEREIS queries.  Buffer is shared with
-  that for ISINDEX queries, and invoked via Up-Arrow or Down-Arrow following
-  the WHEREIS ('/') command.  The 'n'ext command still uses the last WHEREIS
-  query, not necessarily the last entry in the recall buffer, which might
-  have been entered via a 's'earch command for an ISINDEX document. - FM
-* Extended treatment of FORMs which have only one INPUT (TYPE="text") field
-  for user entries as SUBMITting on press of RETURN in that field, so that
-  this behavior is retained if INPUT TYPE="hidden" fields are present. - FM
-* Tweaks of bookmark deletion sanity checks. - DT
-01-01-96 (Happy New Year!!!!)
-* Added circular recall buffer for ISINDEX queries.  Up-Arrow will cylce
-  you from the most current query in the list to previous ones, and roll
-  from the oldest to the most current.  Down-Arrow will cycle from the
-  oldest query to subsequent ones, and roll from the most current to the
-  oldest.  If a previous query is reused, it is removed from the recall
-  buffer and reinserted as the most current.- FM
-* Plugged memory leaks in LYUtils.c and LYJump.c. - FM
-12-30-95
-* Added LOCALHOST_ALIAS symbols for lynx.cfg which can be set to local
-  host aliases or to trusted hosts at other sites which will be accepted
-  as "local" when the -localhost switch is set. - FM
-* Added the endash and emdash entities. - FM
-12-29-95
-* Use exit(0) versus exit(-1) more consistently for normal versus abnormal
-  exits, respectively. - FM
-12-26-95
-* Tweak of RELOAD handling for lynxcgi URLs. - FM
-* More anti-crash protections for bad HTML. - FM
-* Tweak of dynamic SOCKS mods. - TZ
-12-23-95
-* Tweaks of directory building on VMS. - FM
-* Tweaks of log file declarations for direct wais builds. - FM
-* Tweak of DIRED_SUPPORT mods so that non-TAG entries don't show up when
-  there are tagged files. - DT
-12-22-95
-* Added HTMake_VMS_name() to HTFTP.c for use by Unix as well as VMS with
-  VMS ftp servers. - FM
-* Added INSERT and ALIAS to the DTD, updated PARAM and OVERLAY, and made
-  FIG a paragraphing block, all as described in the 12-21-95 W3C working
-  draft for INSERT.  In contrast to FIG, the INSERT and "heritage" EMBED
-  and APPLET elements invoke paragraphing only if their content displayed
-  by Lynx dictates it.  The rules for resolving the sources for INSERTs or
-  for handling its ISMAP attribute are extremely complicated, and are not
-  implemented.  Let's wait to see how people in the "real world" try to
-  make sense of them and actually use INSERT (if they do 8-).  We still
-  create source links in "clickable_image" mode for the "heritage" versions
-  of FIG, OVERLAY, EMBED and APPLET markup, and send a 0,0 cooridinate pair
-  for IMG with the ISMAP attribute.  See comments in HTML.c - FM
-12-21-95
-* Fixed bug in yesterday's ftp password-handling mods that could cause a
-  crash, and handle ftp://user:@host/path as specified in RFC 1738. - FM
-* Added protection against crashes for SELECT tags without the (required)
-  NAME attribute. - FM
-* Added code in HTFTP.c for recognizing MS Windows (Chameleon NEWT) servers
-  and parsing their LIST output (tested on ftp://emoryi.jpl.nasa.gov/) - FM
-* Another typo fix for VMS GNUC in HTFinger.c. - FM
-* Modified HTFTP.c to use personal_mail_address, if available, for the
-  password with anoymous FTP.  It will still use "user@" (trim off the
-  host) if the host does not contain a dot and thus could not be a fully
-  qualified domain name, so it will work with Unix servers such as
-  ftp.uu.net (see get_connection() in HTFTP.c), but this will cause it
-  to fail with MS Windows servers. - FM
-* Added lots more info to the trace output for the ftp gateway. - FM
-12-20-95
-* Modified HTFTP.c to handle a hex escaped slash (%2F) following the
-  "punctuation" slash according to the strict provisions of RFC 1738
-  when connected to VMS ftp servers, so that a device can be in the
-  path and not be mishandled as a subdirectory, e.g., the URL
-     ftp://user:password@host/%2Fsys$common/syshlp
-  will create a directory listing for sys$common:[syshlp]. - FM
-* Fixed typo for VMS GNUC in HTFinger.c. - FM
-12-19-95
-* Enhancements of Unix DIRED_SUPPORT (see header of LYLocal.c). - DT
-12-18-95
-* Tweaks of element and entity structure alignments. - FM
-12-17-95
-* Tweaks of APPLET CODEBASE attribute resolving. - FM
-* Added support for a -nosocks command line switch to turn off SOCKS proxy
-  usage if Lynx was SOCKSified. - Thomas Zerucha (tz@execpc.com)
-12-16-95
-* Added the APPLET element and attributes to the DTD, and code for
-  creating links to the Applet code via image_links - FM
-* Added code to handle password fields in telnet URLs. - FM
-* Expanded EMBED as an "attribute soup" (for compatibility with
-  old versions of Netscape). - FM
-12-15-95
-* Added PARAM, and its attributes in the W3C draft for EMBED, to the DTD,
-  and code in HTML.c to minimize the possiblity of an INPUT belonging to
-  an EMBED being misassociated with a standard FORM container. - FM
-* Added "first pass" EMBED handling.  Should be OK with both the W3C
-  container version and the Netscape "attribute soup" version (we'll
-  see 8-).  The clickable_image switch and toggle ('*') are now misnomers.
-  They will cause creation of links to the EMBED SRCs whether they are
-  images or not. - FM
-* Enhancements of Unix uploading (see header of LYUpload.c). - GL
-12-14-95
-* Modified LYUnEscapeEntities() and LYExpandString() in HTML.c to make
-  it more likely that they'll be handled correctly across flavors of
-  compilers. - FM
-* Changed NETSCAPE_QUOTES and -netscape_quotes to SOFT_DQUOTES and
-  -soft_dquotes. - FM
-* Added '&' to the exclusion list for VMS suggested file names. - FM
-12-13-95
-* Added CAN_ANONYMOUS_GOTO_TELNET_PORT symbol which if set TRUE in
-  userdefs.h will allow anonymous users to specify a port in 'g'oto
-  commands for telnet URLs. - FM
-* Added NETSCAPE_QUOTES symbol which if set TRUE in lynx.cfg will cause
-  Lynx to emulate the Netscape bug of treating  '>' as a co-terminator
-  of a double-quoted attribute value and the tag which contains it. - FM
-* Forgot to define FORM_LINK_RESUBMIT_MESSAGE in the distribution's
-  userdefs.h for yesterday's mods. - FM
-* Forgot to put the HTFile.c with the LIST_FORMAT mods into the
-  distribution (maybe I should just concentrate on Christmas 8-). - FM
-12-12-95
-* Changed handling of the no-cache META directive so that it applies to
-  the document which contains the META tag, rather than to any form submit
-  buttons within it.  The form's CGI script should return a stream which
-  contains the directive to force resubmissions, and any (e.g., ISINDEX)
-  script or (e.g., foo.shtml) document can include the directive to
-  force reloading by Lynx. - FM
-* Added ALWAYS_RESUBMIT_FORMS symbol in userdefs.h and lynx.cfg for setting
-  forced resubmissions of forms, and a -resubmit_forms command line switch
-  for toggling the default. - FM
-12-11-95
-* Moved values of LYStrings.h function key definitions from 0x80 - 0x8D to
-  0x100 - 0x10D and modified all the structures and functions in LYKeymap.c
-  and LYEditmap.c accordingly. - FM
-* Added the KOI8-R (Russian) character set. - Andrey A. Chernov
-  (ache@astral.msk.su).
-* Replace gets() with fgets() for the Unix setup() in LYCurses.c - AAC
-* Tweaks for building with FreeBSD. - AAC & FM
-* Added handling of META directives for ISO-8859-2 and KOI8-R if the
-  document is text/html and a server header didn't already set the
-  charset. - AAC & FM
-12-10-95
-* Tweaks of memory management. - FM
-* Made the LONG_LIST parameters for Unix local directory listings
-  configurable via userdefs.h and lynx.cfg - DT
-12-09-95
-* Added code for re-computing and retaining the current link if it is still
-  on the page when using the LYK_UP_TWO and LYK_DOWN_TWO commands. - FM
-* Added support for nested emphasis tags (they're all still displayed as
-  HT_UNDERLINE, but no longer terminated prematurely). - FM
-12-08-95
-* Added more suffix maps in HTInit.c. - FM
-* Tweak of META attribute definitions. - FM
-12-06-95
-* Don't reject LYNXKEYMAP and lynxcgi URLs with the -localhost switch. - FM
-12-05-95
-* Made the loaded_texts list in GridText.c functionally "circular", so
-  that returning to a cached document causes it to be treated as the most
-  current, and dumps of cache, when necessary to load a new document, are
-  done for the least recently viewed rather than least recently fetched
-  document. - FM
-* Show the METHOD and ACTION in showinfo() of LYShowInfo.c if invoked when
-  the cursor is positioned on a submit button. - FM
-* If the user mode is advanced, keep showing the URL in the statusline
-  when Lynx is in forms mode but the link is not a form field. - FM
-12-03-95
-* Tweaks of code for submissions of forms with only a single INPUT
-  (TYPE="text") field. - FM
-12-02-95
-* Treat any META directives with a NAME or HTTP-EQUIV value of "Pragma"
-  or "Cache-Control" and a CONTROL value of "no-cache" as an instruction
-  always to resubmit any form(s) in the document. - FM
-* Added parsing of META directives.  Functions can be added where indicated
-  in HTML.c. - FM
-* Include the HTTP/1.1 "Cache-Control: no-cache" header together with the
-  HTTP/1.0 "Pragma: no-cache" header for reload or resubmit requests. - FM
-* Fixed bug in the check for an all-space ALT in IMG when creating a
-  link for its SRC. - FM
-* Fixed parsing of square-bracketted DOCTYPE fields. - FM
-12-01-95
-* Improvments of logic for indentations within lists. - FM
-11-30-95
-* For resiliency, treat upper case letters as equivalent to lower case in
-  scheme names (e.g., allow "HTTP" as well as "http"), by converting them
-  to the appropriate case before entering them into the anchor hash table
-  or otherwise acting on them. - FM
-* Added ability to change the default reply to the "really quit" prompt
-  from "[Y]" to "[N]" via a compilation symbol in userdefs.h. - DT
-11-29-95
-* Added ALIGN attribute for HR (default is "center"). - FM
-11-28-95
-* If a form has a single field, and it's INPUT TYPE="text", treat
-  RETURN as a submit command for it. - FM
-* Added START as a synonym for the SEQNUM attribute in OL. - FM
-11-27-95
-* Enhancements of the wais gateway. - FM
-11-26-95
-* Fixed up HREF, ACTION and SRC resolving to be conformant with RFC 1808
-  (except that we don't yet support a ";params" field). - FM
-11-25-95
-* Tweaks of yesterday's jumps file mods. - FM
-11-24-95
-* Enhancements of 'J'umps file handling, including ability to install
-  multiple jumps files mapped to different keys and associated with
-  different statusline prompts and recall buffers. - DT & FM
-* Deal with ALTs that have only spaces when in clickable_image mode. - FM
-* Worked in WM's mods to make the REVERSE_CLEAR_SCREEN_PROBLEM workaround
-  a configuration option via ENABLE_SCROLLBACK in lynx.cfg and a command
-  line toggle (-enable_scrollback), for use with comm programs which have
-  screen display buffers that can be accessed for review independently
-  of the Lynx commands (see comments in lynx.cfg). - FM
-11-23-95
-* Use the BASE, if present, instead of the original document URL, as the
-  default ACTION for forms. - FM
-* Tweaks of paragraph alignment handling. - FM
-* Make sure we don't realloc() a NULL env pointer in LYCgi.c. - DT
-* Cancel bookmark deletion if the line does not have a complete link or if
-  there is more than one link on the line. - DT
-11-21-95
-* Fixed bad logic in the setting of bold and/or underline starting points
-  in new lines created via split_line() of GridText.c. - FM
-* Added case KEY_BACKSPACE in LYgetch() of LYStrings.c. - GL
-11-19-95
-* Fixed problem of SELECT causing all immediately following white space
-  to be ignored. - FM
-* More tweaks of paragraphing, and handling of labeled blocks within
-  PRE blocks. - FM
-11-18-95
-* Added INFOSECS, MESSAGESECS and ALERTSECS symbols in userdefs.h and
-  lynx.cfg for setting the durations of statusline pauses (important when
-  using Lynx with a braille-based access).  See comments in userdefs.h and
-  lynx.cfg for more information. - FM
-* More tweaks of paragraph handling. - FM
-* Include the Reference lists is crawl output files if the -number_links
-  switch was included and the -nolist switch wasn't. - FM
-11-17-95
-* Tweaks of finger and telnet gateways. - FM
-* Added handling of MARQUEE equivalently to BANNER. - FM
-* Various tweaks of 8-bit character and related HTML handling (OLs
-  or ULs without attributes or some wrong combinations were crashing
-  Lynx). - FM
-11-16-95
-* Implemented the ID attribute for TAB, and the TO and INDENT attributes
-  when its ALIGN attribute is "left" (the default) and the style's
-  alignment is HT_LEFT (the default).  If these conditions don't apply,
-  or if the TAB target is outside the current margins or would overlap
-  prior text, a collapsible space is inserted instead of TABing.  The
-  INDENT values are in "en" units, treated as 12 per column.  Added
-  tabtest.html in the test subdirectory to illustrate TABing. - FM
-11-15-95
-* Added the HTML 3.0 DTD structures and definitions for SPOT, and fully
-  implemented it (use SPOT ID="foo" as SGML_EMPTY instead of named anchors
-  with no content). - FM
-* Added the HTML 3.0 DTD structures and definitions for TAB.  For now, it
-  simply puts a collapsible space in the text stream if the TO attribute
-  is present. - FM
-* Added the top-level HTML 3.0 DTD structures and definitions for MATH, and
-  implemented it's ID attribute.  The markup is captured as HTML_LITTERAL,
-  and until we have a processor, is output as is, in brackets to alert the
-  user about the situation. - FM
-11-14-95
-* Tweaks of LYK_UP_LINK and LYK_DOWN_LINK handling, and added them to the
-  default mapping as '<' and '>'. - FM
-* Tweaks of LYK_TOOLBAR handling. - FM
-11-13-95
-* Added LYK_TOOLBAR (mapped by default to '#') for jumping up to the pseudo
-  Toolbar or Banner if present in the current document.  Using '#' instead
-  of Home to jump there allows you to Left-Arrow back to where you were in
-  the current document.  Set up a BANNER in about_lynx-dev.html to serve
-  as an example of this feature. - FM
-* Added the HTML 3.0 DTD structures and definitions for BANNER, implemented
-  its ID attribute, and set it up to act as a pseudo Toolbar if one hasn't
-  been set up already via REL attributes of LINKs. - FM
-* Tweaks of paragraphing for CAPTION, CREDIT, FOOTNOTE, and NOTE. - FM
-11-12-95
-* Handle (i.e., ignore) any P that immediately follows an LI, DT or DD. - FM
-* Cancel any file fetch and viewer spawn or launch during traverals. - FM
-11-11-95
-* Added finger gateway (finger://host[/request]) based on patches from
-  Martin Hamilton (martin@mrrl.lut.ac.uk). - FM
-* Added LYE_TAB for mapping keys to act as LYE_ENTER, but return '\t' so
-  that the behavior of TAB is emulated in TEXTAREAs, and mapped Do to
-  LYE_TAB in the default binding. - FM
-* Fixed glitch in handling of DEC extended characters which contain two
-  digits (affected Do and Find). - FM
-* Better documented that disabling access to hidden (dot) files also
-  disables ability to create such files via Lynx. - FM
-11-10-95
-* Added handling of mailto as a form ACTION.  See http://www.q-d.com/swc.htm
-  for software to extract and unescape the mailed content. - FM
-* Added lynxprog URL handling, which is identical to lynxexec URL handling
-  except that the user is not prompted to enter RETURN before returning
-  to Lynx.  Use lynxprog for scripts or programs such as mail which do not
-  need an enforced pause to let the user read the screen output. - FM
-* Removed code in HTFile.c for treating ',' as a synomym of '.' for
-  hidden files (nobody seems to know why that was being done 8-). - FM
-* Moved inclusions from LYBookmark to tcp.h. - FM
-11-08-95
-* Extend optional hidden (dot) file/directory support to Unix, and embellished
-  it on VMS and Unix with regulation via a command line switch and 'o'ptions
-  menu setting.  See userdefs.h and lynx.cfg for more information. - GL & FM
-* Added support on Unix for straight tar files and a compile time option that
-  disables the ability to extract files from an archive file (since there is
-  no control over the files extracted). - GL
-11-07-95
-* More tweaks of 8-bit character handling. - FM
-* Added "Macintosh (8 bit)" character set. - Neil K. Guy
-  (nkg@freenet.vancouver.bc.ca)
-* Added "Example Lynx Optimized User Home Page" to the online 'h'elp. - FM
-11-05-95
-* Fixed Cc: header handling for email on Unix. - FM
-11-04-95
-* Reference the current character set for any raw 8-bit characters in
-  text/plain streams (but don't translate named or decimal escaped
-  entities, since that's specific for text/html). - FM
-* Block any illegal control or escape characters in text/plain streams,
-  to avoid problems if a binary ftp or local file was mistyped and sent
-  to the screen as that Content-type. - FM
-* Eliminated mod in SGML.c which emulated Netscape's bug of treating '>'
-  as both a close-double-quote and close-tag (Netscape v2.0 fixed its
-  bug, so hopefully the bad HTML with it will go away. 8-). - FM
-11-02-95
-* Assume an ISO-8859-1 character set for all local files.  If it's
-  actually ISO-8859-2 and the terminal is using that, set the Lynx
-  CharSet option to "ISO Latin 1" so that 8-bit characters will be
-  sent raw to the terminal. - FM
-* Added Martin Ramsch's iso8859-1.html to the test subdirectory.
-  Use it to complete the conversion tables in LYCharSets.c. - FM
-* Don't block insertion of a lead space for INPUTs in PRE blocks, so
-  alignments will be compatible with those of graphic clients. - FM
-* Don't block all access to the 'p'rint menu for the print restriction
-  (should still offer printer options which have the TRUE flag set;
-   all access is still blocked for -validate). - FM
-* Replaced the STDfoo_FILENO symbols in LYCgi.c with the more portable
-  fileno(stdfoo). - WM
-* Added NCURSESINCDIR compilation symbol for setting the path to the
-  NCURSES header file in LYCurses.h to that of the latest version. - GL
-* Tweaks of interrupt handling on VMS.
-10-31-95
-* Added more suffix maps in HTInit.c. - FM
-* Mods in LYCgi.c which hopefully makes the code more portable across
-  Unix flavors. - FM
-10-28-95
-* Tweaks of global flag initializations and resets in HTML.c. - FM
-* Added RESOLVLIB symbol in the top Makefile for including -lresolv
-  in the LIBS= list, if needed, for SUN 3 or 4 OS, and comments about
-  that in the Makefile, and INSTALLATION and PROBLEMS files based on an
-  explanation from Will Mengarini (seldon@eskimo.com). - FM
-10-27-95
-* Mods of top level Makefile:  Added NOPORT compilation symbol for forcing
-  use of PASV in ftp URLs.  Added NO_S_IFSOCK compilation symbol for Unix
-  flavors which lack an S_IFSOCK definition for lstat(). - FM
-* Reload the current document whenever the character set is changed. - FM
-* Don't reference entities for raw (or decimal escaped) 8-bit characters
-  if the document is not text/html, or for any local files if the charset
-  is Latin. - FM
-* Made Ctrl-H a synonym for DELETE instead of Left-Arrow in the line
-  editor. - FM
-10-25-95
-* Handle all characters in strings for the new line editor as unsigned
-  so they don't go negative if 8-bit. - DW
-* Restored proper handling of the MAXLENGTH attribute in INPUTs for
-  strings entered with the new line editor. - FM
-10-24-95
-* Deal with all non-printing characters when setting up the SELECT
-  pop-up window strings. - FM
-* Handle raw 8-bit characters via reference to the ISO-LATIN1 named
-  entities so they in turn can be referenced to the currently selected
-  character set. - FM
-* Yet more tweaks of non-breaking space handling. - FM
-10-22-95
-* Improved treatment of the startpage URL with -traversal so that it only
-  blocks traversals of links on other servers.  Any links on the same
-  http server which shouldn't be traversed may be blocked via explicit
-  and/or wildcarded entries in REJECT.DAT.  Updated CRAWL.announce to
-  make this more clear. - FM
-* Typo fixes in top-level Makefile. - Steve Jeske (jeske@pa.dec.com)
-10-21-95
-* Handle decimal escaped entities via reference to the ISO-LATIN1 named
-  entities so they in turn can be referenced to the currently selected
-  character set. - FM
-10-20-95
-* Tweaks of formatting for LONG_LIST directory lists and README file
-  inclusions in HTFile.c and HTVMSUtils.c. - FM
-* Tweaks of decimal escaped non-breaking space handling in HTML.c. - FM
-* Force unescaping of hidden VALUEs for INPUTs as ISO-LATIN1. - FM
-* Added ".shtml" and ".htmlx" as text/html extensions in HTInit.c. - FM
-10-18-95
-* Made parsing of the name and address out of the NNTP From: header more
-  reliable in HTNews.c. - FM
-* Added "LYNX_TEMP_SPACE" environment variable (Unix) or VMS logical,
-  which if present at run time will be used instead of the the TEMP_SPACE
-  definition in userdefs.h as the path prefix for temporary files. - FM
-10-17-95
-* Added TYPE attritute for OL, and coordinated it with the SEQNUM and
-  CONTINUE attributes.  The default TYPE is "1" (Arabic numbers), and
-  SEQNUM values for it can range from -29997 to the system's maximum
-  integer.  The Alphabetic TYPEs are "A" (upper case) and "a" (lower
-  case), and can range from 1 (" A." or " a.") to 18278 ("ZZZ." or
-  "zzz.").  The Roman TYPES are "I" (upper case) and "i" (lower case),
-  and can range from 1 (" I." or " i.") to 3000 ("MMM." or  "mmm.").
-  SEQNUM values should always be Arabic, and will be converted to
-  other types (e.g., SEQNUM="27" TYPE="a" will yield "aa." for the
-  next LI). The CONTINUE attribute will cause the sequence and TYPE
-  of the preceding OL to be continued for LIs in the current OL. - FM
-10-16-95
-* Treat a value of "*" for "no_proxy" as a global override of any
-  existing proxy variables. - FM
-10-15-95
-* Deal with raw or decimal escaped non-breaking space characters in
-  SGML_character() of SGML.c and LYUnEscapeEntities() of HTML.c. - FM
-10-14-95
-* Updated info about lynx-dev in lynx.man and lynx.hlp. - FM
-* Don't force LINKS_ARE_NUMBERED in dumps if -nolist was included. - FM
-* Output the References list for dumps with OL-style numbering. - FM
-* More tweaks of "anti-spoof" handling for telnet URLs. - FM
-10-13-95
-* Block direct access to the telnet prompt for telnet URLs entered without
-  a host field. - FM
-* Include the TRUSTED flag in spawns for OpenVMS/AXP v6.1 or greater. - FM
-10-12-95
-* Convert any strings in news articles that look like URLs into links. - FM
-* Use the Followup header in news articles, if present, for followups.
-  Otherwise, use the Newsgroups header.  - FM
-* Ignore any invalid ISO 646 7-bit control characters or ISO 8859 8-bit
-  control characters in SGML_character() of SGML.c. - FM
-10-11-95
-* Typo fix in HTTCP.c for non-MULTINET VMS builds. - Gary Chow (garyc@mrs.com)
-10-09-95
-* Assume the root as path in HTParse() of HTParse.c if the access and host
-  but no path are given, and the access is http, https, or ftp. - FM
-10-05-95
-* Make sure the FREE(x) macro gets defined for HTTCP.c. - FM
-10-04-95
-* Mods in HTTCP.c to prevent string buffer overruns. - FM
-* Prevent possible string buffer underrun for terminal white space trims
-  in GridText.c. - Renato Buda (renato@peoplebank.co.uk)
-10-01-95
-* Updated the listserv and archive addresses in the about and help files. - FM
-09-30-95
-* Added support for Windows_NT FTP servers. - FM
-* Added ability to send a self copy of mail via a Cc: header on Unix
-  (sending of self copies is set via the mail software itself on VMS). - FM
-* Tweaks of SOCKET_ERRNO handling in HTTCP.C. - FM
-* Include unistd.h more consistently on Unix (via tcp.h) if NO_UNISTD_H
-  is not defined. - FM
-* Modified the FreeBSD and NetBSD libwww Makefiles to use the
-  CommonMakefile. - FM
-* Makefile addition (snake3) for the HP-UX purchased compiler. - Andy
-  Finkenstadt (genie@panix.com)
-09-29-95
-* Deal with HTAlert.c function calls to LYgetstr(), e.g., for a password,
-  when doing a -dump or -source non-interactive fetch. - FM
-* Output HTAlert() messages to both stderr and stdout in TRACE mode. - FM
-09-28-95
-* Added a description of the line editor's default key bindings to the
-  help file set. - FM
-* Tweaks of the line editor. - FM
-* Declare DCLspawn_exception() in LYCurses.c as unsigned int only for
-  DECC (otherwise as int, for VAXC and GNUC). - FM
-09-27-95
-* Added common line editor for forms and prompted queries, with configurable
-  line editor key bindings.  See LYStrings.h and LYEditmap.c for the default
-  configuration. - DW & FM
-* Tweaks of build.com's symbol assignments when in batch mode. - MM
-09-22-95
-* Added ISO-8859-2 CharSet, and mods for Accept-Charsets handling based
-  on patches from Mark Martinec (Mark.Martinec@nsc.ijs.si). - FM
-09-19-95
-* Tweaks of OL attribute handling.  Allow negative SEQNUM values.  Keep
-  better track of CONTINUE versus non-CONTINUE OL sequences within nests.
-  Allow CONTINUE in the first OL of a new nest, set to the last LI count
-  of the previous nest (at any depth in that previous nest). - FM
-09-17-95
-* Tweak of LYUnEscapeEntities() in HTML.c. - DW & FM
-* Another tweak of groupid handling in LYShowInfo.c. - DW
-* More fixes of 7-bit character approximations. - DW
-* More help and about file tweaks. - DSL
-09-16-95
-* Added the HTML 3.0 DTD structures and definitions for DIV, and implemented
-  its ALIGN and ID attributes.  I think I have it behaving rationally if it
-  is used together with CENTER, LEFT and/or RIGHT (Though they're all treated
-  as DIVs by Lynx, and shouldn't be embedded in each other, somebody will do
-  that anyway!. 8-). - FM
-* Added the HTML 3.0 DTD structures and definitions for FN (Footnote).  It
-  should be handled as a popup window, but for now, it's implemented as a
-  labelled block and has the same style and behavior as a NOTE with an ID
-  attribute. - FM
-* Some compilers can't handle the continuation line in yesterday's
-  LYCurses.h.  Made it one long line. - FM
-09-16-95
-* Further enhanced the online help and about files. - FM
-* Added -DNO_FILIO_H to Makefile for SCO. - FM
-* Worked in stuff from 14-Sep-95 lynx2-4-2 upgrade. - FM:
---------------------------------------------------------
-  09-06-95
-  * Added patch to compile Lynx on BSDI with Ncurses package. -RK
-  09-06-95
-  * Ported Lynx to DG-UX. - RK
---------------------------------------------------------
-09-12-95
-* Further modified HTNews.c so that it returns unmodified news messages
-  when the display is toggled to source ('\') or when downloading them,
-  so uuencoded messages always can be saved without corruption, and so
-  I also changed the SCAN_FOR_BURIED_NEWS_REFS compilation default to
-  TRUE. - FM
-* Simplified a compound if() in HTParse.c which may have been giving the
-  AIX v4.1 compiler a headache. - FM
-09-11-95
-* Eliminated distinct style sheets for CAPTION and CREDIT so their content
-  will inherit the current style, and added HTML_EnsureDoubleSpace() and
-  HTML_ResetParagraphAlignment() in HTML.c for coping with the absence of
-  distinct style sheets for those elements, and for FIG.
-09-10-95
-* Added SCAN_FOR_BURIED_NEWS_REFS configuration symbol in lynx.cfg, with
-  a compilation default of FALSE, and a -buried_news switch for toggling
-  the default.  When TRUE, Lynx scans the bodies of news articles for
-  references and converts them to news links, but creates false news
-  links if any email addresses are enclosed in angle brackets, and can
-  trash uuencoded messages. - FM
-* Eliminated distinct style sheet for FIG so its content will inherit the
-  current style and display appropriately within lists.  Should be OK if
-  people use valid HTML 3.0 in it's content for non-graphic clients. - FM
-* Added links for the W3C HTML 2.0 and 3.0 specifications and for the
-  HAL HTML validation service to the Lynx help file set.
-* Made the BOLD_NAME_ANCHORS compilation symbols FALSE by default.  Most
-  documents now include emphasis tags for NAME (ID) anchors if it's desired,
-  because the most common graphic clients don't emphasize them by default,
-  so we should adjust to that in Lynx as well (IMHO 8-).  Added emphasis
-  tags for the NAME anchors in the Lynx help files. - FM
-* Eliminated forced uppercasing of H1 headers.  Most documents have mixed
-  casing and we should preserve it (IMHO 8-).  Added a BOLD_H1 configuration
-  symbol, set FALSE by default, for making H1 headers bold even if BOLD_HEADERS
-  is FALSE.  Modify the two configuration symbols in lynx.cfg for the pattern
-  or header emphasis which pleases you. - FM
-* Tweak of list paragraphing.  Added HText_PeviousLineSize() in GridText.c
-  for determining if the previous line had only non-printing characters. - FM
-09-09-95
-* Impelemented true paragraphing and the P ALIGN attribute within lists (UL,
-  OL and DL blocks) and within ADDRESS blocks.  Paragraphs within lists have
-  one blank line inserted.  Within ADDRESS blocks, a newline will be created
-  if needed, but no blank lines are inserted.  Use BR, not P, to force extra
-  newlines within blocks.  Do not place a P immediately following the LI or
-  DD tags.  Alignments of P blocks are done with respect to the "second line"
-  margins of LI or DD elements. - FM
-09-08-95
-* Convert '~' to getenv("HOME") in file URLs whether or not DIRED_SUPPORT
-  is defined. - FM
-* Tweak of TR and more tweaks of HR handling.  Added HText_LastLineSize()
-  and HText_TrueLineSize() functions in GridText.c for determining if
-  lines have only non-printing characters in decisions on whether to
-  insert additional newlines. - FM
-09-07-95
-* Act on Page-Up, Page-Down, Home, End, Find and Select in the form_getstr()
-  editor (hoping they have their default mappings 8-).  Also act on Remove
-  and Control-D as delete keys in that line editor (as in the LYgetstr()
-  line editor). - FM
-* Tweak of HR handling. - FM
-* Mods to prevent creating multiple copies of temporary printer files. - FM
-* More fixes for NeXT.  Temporary files for VIEWER, DOWNLOADER or PRINTER
-  commands on NeXT all have the ".html" default suffix replaced with ones
-  indicative of the Content-type. - FM
-09-06-95
-* Mods to prevent creating multiple copies of temporary viewer or downloader
-  files. - FM
-* Fixes for NeXT. - FM
-09-05-95
-* Enabled the -help switch when no configuration file is available and
-  Lynx would otherwise exit (i.e., it now outputs the help message before
-  it exits). - FM
-* Documented the -child switch. - FM
-* Fixed and documented the -nolog switch. - FM
-* Changed the -linknums switch to -number_links, fixed the code to work,
-  and documented the switch. - FM
-* Made handling of escaped colons (\:) in VIEWER commands reliable. - FM
-09-04-95
-* Implemented the PLAIN attribute for UL, and the SEQNUM and CONTINUE
-  attributes for OL. - FM
-* Updated the DTD structures and definitions for DD, DL, DT, LI, OL and UL
-  to HTML 3.0, added LH, and implemented full HTML 3.0 ID handling for those,
-  and B, BLINK, BR, CENTER, CITE, CODE, DFN, DIR, EM, FORM, KBD, I, LEFT,
-  LISTING, MENU, PLAINTEXT, PRE, RIGHT, SAMP, STRONG, TT, U, VAR and XMP
-  (some of which are obsoleted in HTML 3.0, but what the heck 8-). - FM
-09-03-95
-* Made bolding of NAME (ID) anchor contents configurable in lynx.cfg. - FM
-09-02-95
-* Tweaks of FIG and OVERLAY handling:  Only put up [FIGURE] (and +[OVERLAY])
-  links if clickable_images is set.  Assume P ALIGN="left" if contained
-  text does not begin with an explicit tag that sets an alignment. - FM
-* Implemented full HTML 3.0 ID handling for IMG. - FM
-* Tweaks for FreeBSD. - Masafumi NAKANE (t94303mn@sfc.keio.ac.jp)
-08-31-95
-* Added support for using a TITLE attribute as the subject in anchors with a
-  mailto HREF (A HREF="mailto:address" TITLE="RE: subject"). - FM
-08-30-95
-* Implemented full HTML 3.0 ID handling for A, ADDRESS, BLOCKQUOTE, BQ,
-  CAPTION, CREDIT, FIG, H1 - H6, HR, INPUT, NOTE, OPTION, P, SELECT, TABLE,
-  TD, TEXTAREA, TH and TR. - FM
-* Updated the DTD structures and definitions for ADDRESS to HTML 3.0. - FM
-* Block insertion of any escape sequence characters or substitutes when
-  editing form INPUTs or TEXTAREAs. - FM
-08-29-95
-* Tweak of ALIGN attribute handling in paragraphs. - FM
-* Protect against hanging on escape sequences if received (illegally) in
-  documents typed as text/plain or text/html. - FM
-08-28-95
-* Declared DCLspawn_exception() as an unsigned int to keep DECC happy. - FM
-08-27-95
-* Give LYUpload() a return value (because LYLocal.c has been testing for
-  one all these years 8-). - FM
-* Force reload on return from 'o'ptions menu if HTfileSortMethod or
-  keypad_mode are changed. - FM
-* Force no cache of keymap display whenever vi_keys or emacs_keys are
-  changed. - FM
-* Added Remove and Control-D as Delete synonyms for removing characters to
-  the left of the cursor in the LYgetstr() line editor, and Control-F as
-  Right-arrow synonym for moving the cursor to the right. - FM
-08-24-95
-* Modified prompted string editing via LYgetstr() along lines in patch
-  from PM (editing of form INPUT and TEXTAREA strings is unchanged).
-  Here's how the prompted string editing works:  Left-arrow and Backspace
-  (Control-H) move the cursor to the left, and Right-arrow to the right,
-  within the string.  Characters are INSERTed at the cursor position.
-  Delete removes characters to the left of the cursor.  Home, Find and
-  Control-A move the cursor to the beginning of the string.  End, Select
-  and Control-E move the cursor to the end.  Control-U erases the string.
-  Control-G cancels at any time.  Return accepts if a string is present,
-  or cancels if it was fully erased or never entered.  A right-curley
-  brace appears in the right-most column when the string has segment(s)
-  scrolled off screen, and if left scrolled, the cursor sits on it for
-  further editing with the above command keys (or acceptance via Return).
-  Long strings scroll both left and right between the prompt string and
-  right-curley brace.  Had to modify 17 files to make this line editor
-  crash safe (I hope people like it!  8-). - FM
-08-22-95
-* Use a macro in parse_arg() of LYMain.c to ensure proper handling of
-  switches which take a value and might have a space instead of an '='
-  between the name and value. - DW
-* Insulate any system RTL's getline() from the one in HTInit.c. - DW
-* Enabled editing of titles when adding bookmarks. - FM
-08-21-95
-* Fixed the IBM PC character set in LYCharSets.c (Note:  The PC-set has the
-  currency symbol but it is a control character - ^O - so there is a chance
-  that curses or the user's terminal may discard it.  Did not fix the
-  Icelandic characters). - DW
-* Check whether getpwuid() and getgrid() have returned NULL pointers in
-  LYShowInfo.c. - DW
-* Break up the too elaborate, compound assignment statements in LYList.c
-  so no compilers get tripped up by evaluation order effects. - DW
-* Worked in mods from DW to cope with CR, CRLF or LF all as EOL in HTML.c
-  and GridText.c (not sure if they take into account all of the consequences
-  of Lou's "big cheat" in GridText.c, but they appear to, so far). - FM
-* Explicitly preserve the Lynx bookmark file mode on Unix. - DSL
-08-20-95
-* More documentation and help updates. - FM
-08-19-95
-* Updated INSTALLATION and comments in userdefs.h and lynx.cfg. - FM
-* If save to disk was done via the download menu, and a VMS rename() attempt
-  succeeded so we don't spawn a COPY, we no longer can access the file via
-  the download menu, so pop in that situation. - FM
-* Worked in stuff from 16-Aug-95 lynx2-4-2 upgrade.  Most had already been
-  added to lynx2-4-FM.  This is the new stuff. - FM:
----------------------------------------------------
-  08-16-95
-  * Applied patch from Peter van Heusden (pch@ucthpx.uct.ac.za) to fix
-    a bug when lynx encounters an OPTION tag before the style is
-    ever updated. - CL
-  08-09-95
-  * Added some tweaks to Makefile and LYCurses.h to get lynx to properly
-    compile on ISC.  Thanks to Robert Salter (salter1@master.nsbf.nasa.gov).
----------------------------------------------------
-08-18-95
-* Added a -validate switch for turning off everything except http URLs,
-  helpfiles, and secure menus in Lynx.  Can be used with -dump in CGI
-  scripts, but is intended for use with anonymous telnet logins.  In the
-  latter case, the user can start with his/her server's or userdir homepage,
-  and validate everything, while able to manipulate the display features
-  (e.g., whether or not links are numbered) and turn on trace (Control-T,
-  then Control-R to reload) when a "Bad HTML" document is encountered.  The
-  telnet approach is particularly useful when used with the 'l'ist feature.
-  When used with -dump, compare it with versus without -nolist. - FM
-* Added a missing curley brace in EF's (08-16-95) patches. - FM
-08-17-95
-* Added HISTORICAL_COMMENTS symbol which if set TRUE in lynx.cfg will cause
-  Lynx to revert to the "historical" behavior of treating any '>' as a
-  comment terminator instead of (a valid) '-->', and a -historical switch
-  for toggling the default behavior. - FM
-* Added a -nolist switch for turning off the link list feature in dumps. - FM
-* Modified SGML.c so that it still substitutes the expected end tag if a
-  different one is encountered (e.g, due to a document having interdigitated
-  instead of validly embedded tags), but doesn't do a wind down of the
-  element stack.  This gives it a better chance of recovering from bad
-  HTML, and the sanity checks I've added thus far in HTML.c appear to still
-  be adequate for avoiding crashes (we'll see 8-). - FM
-08-16-95
-* Mods to support within-document anchors in documents returned via
-  lynxcgi scripts. - FM
-* Worked in EF's patches to handle changes of keymaps under DIRED_SUPPORT
-  with OK_OVERRIDE, and to give the user some feedback during an Install
-  command. - FM
-08-15-95
-* Don't include a Referer header for 'g'oto URLs. - FM
-* Added patches from PR for compilations with VMS port of GNUC:  Modified
-  several prototypes to avoid GNUC warnings about conflicts with ones in
-  lib$routines.h, and added code in HTVMS_WaisUI.c to deal with an obscure
-  glitch for GNUC v2.6.[123] and v2.7.0 (not present in v2.6.0 or earlier,
-  and fixed in v2.7.1). - FM
-* Worked in code from PR as LYVMS_FixedLengthRecords() in HTFWriter.c to
-  change attributes of binary files on VMS from Stream_LF to FIXED 512,
-  no implied carriage control, best try contiguous.  Replaces the spawn
-  to execute FIXED512.COM. - FM
-08-14-95
-* Modified TEXTAREA handling to succeed or fail on bad HTML equivalently
-  to Netscape. - FM
-08-12-95
-* Mods to avoid crashes and to do something reasonable with OPTION strings
-  that are wider than the available popup window width.  Truncation is
-  indicated by omission of a terminating ']' in the window link, and the
-  window, when popped up, is made equal to the screen width (but we can't
-  wrap the strings within the window, so they're truncated if they still
-  don't fit). - FM
-* Mods to handle INPUT fields that are packaged in PRE and would extend past
-  the wrap column.  No way to make that perfect without a major redesign,
-  but it's better now. - FM
-08-10-95
-* Handle 'g'oto entries equivalently to STARTFILE and HOMEPAGE, i.e., if
-  the user's entry isn't a URL, convert it to a file URL if it's a file
-  or directory on the local system, otherwise convert it to an http URL.
-  For example, "~/" will be converted to a file URL for listing the HOME
-  directory (on both Unix and VMS), and "www.netscape.com" will become
-  "http://www.netscape.com". - FM
-* Fix LYCurses.h to deal with definitions of TRUE and FALSE in cursesX.h
-  on ultrix. - Brian Exelbierd (bex@ncsu.edu)
-* Made SYSTEM_MAIL, and MAIL_ADRS on VMS, configurable in lynx.cfg. - FM
-08-08-95
-* Fixed two initialization problems that could account for reports of
-  inappropriate HEAD requests in pops of cached documents. - FM
-* More tweaks for coping with bad HTML. - FM
-* Fixed bug in code for bypassing bad SUFFIX: or VIEWER: entries. - FM
-08-06-95
-* Added code in GridText.c to deal with syntactically OK but symantically
-  nonsensical uses of ALT="" in IMG tags (i.e., when the IMG is structured
-  to provide the anchor for a link, and so the anchor ends up with nothing
-  but nonprinting characters for bolding), and removed the forcing of an
-  "[ISMAP]" pseudo-ALT in HTML.c.  The show_anchor element in TextAnchor
-  structures is now set to NO whenever an anchor does not have any
-  printing characters. - FM
-* Modified HTML.c to issue only one "Bad HTML" statusline message per
-  document (unless it's one of those unbelievably bad CGI script outputs
-  that are functionally multiple, concatenated documents 8-), and similarly
-  for "Table in Form" and "Form in Table" informational messages. - FM
-* Don't bother prompting whether to send a HEAD request for the current
-  document if there are no links on the page (but still prompt if the user
-  makes a HEAD request when positioned on an inappropriate form link). - FM
-08-05-95
-* Added code in SGML.c for storing Identfiers (e.g., !DOCTYPE) and Comments
-  (i.e., tags beginning with !--) and for reporting them in trace mode.
-  Serves as a model for actually using them someday (i.e, functions for
-  analyzing them could be called where we presently just invoke a trace
-  output to stderr). - FM
-08-03-95
-* Modified SGML.c to handle comments as in the current specs, and put
-  Paul Gilmartin's (pg@sweng.stortek.com) TestComment.html in the
-  test subdirectory. - FM
-* Added binary extensions in HTInit.c that were giving people problems
-  on FTP servers. - FM
-08-02-95
-* Added explicit check for CMU in telnet support with SOCKETSHR-built
-  images. - SB
-* Added -link switch for setting the count in lnk#.dat files with -crawl
-  (needed if you interrupt a traversal and want to pick up again where
-  you left off). - DM
-* More tweaks of -traversal code and Makefile.  All known bugs appear to
-  have been dealt with at this point.  Updated lynx.man, lynx.hlp and
-  help files to include the -traversal and -crawl switches. - FM
-08-01-95
-* Changed the SEQUENT compilation sympbol to PTX2 and added a ptx2 procedure
-  to the Makefile for Sequent Symmetry DYNIX/ptx v2, because more current
-  versions reportedly have solved the problems which the conditional
-  compilation attempted to address. - FM
-* Force in the "[ISMAP]" pseudo-ALT if someone uses ALT="" for an IMG tag
-  that has ISMAP specified. - FM
-* Tweaks of the -traversal code (still experimental). - DM & FM
-07-31-95
-* Worked in code from David Mathog (mathog@seqaxp.bio.caltech.edu) for
-  implementing the TRAVERSAL function from old versions of Lynx, but via
-  a command line switch (-traversal) instead of in a separately compiled
-  executable, and for a CRAWL function, invoked via a command line switch
-  (-crawl), which allows Lynx to be used as the front end for a Web Crawler.
-  See CRAWL.announce for more information. - FM
-* More tweaks of LYCurses.c and LYCgi.c for GNUC on VMS. - SB
-* More tweaks of src/Makefile. - DSL
-07-30-95
-* Tweaks of yesterday's Makefile and descrip.mms files. - FM
-07-29-95
-* Tweak in HTFTP.c to ensure that Lynx doesn't sit around waiting for an
-  FTP server's good-bye message if the server closes the connection itself
-  and doesn't send one. - FM
-* Added GNUC support to the VMS descrip.mms files. - FM
-* Tweaks of HTWAIS.c socket handling on VMS (I can't reproduce a reported
-  problem with SOCKETSHR/NetLIB, but these tweaks might help). - FM
-* Added my guesses at code for HTTelnet.c to implement telnet, tn3270 and
-  rlogin support, if available, when building with SOCKETSHR/NetLIB on
-  VMS. - FM
-07-28-95
-* Mods for Sequent Symmetry DYNIX/ptx - Mark Kolmar (mkolmar@ccs.nslsilus.org)
-* Added GL's lynxcgi patches posted to lynx-dev, plus some tweaks. - FM
-* Worked in GL's lynxcgi mods as in Lynx2-4-2:
-  --------------------------------------------
-   Added George Lindholm's LYNXCGI feature.  This allows lynx to bypass
-   http daemons to run local CGI scripts using a URL of the form
-   "lynxcgi:/path/cgi-script".  To implement in Lynx, LYNXCGI_LINKS
-   must be uncommented in userdefs.h and TRUSTED_LYNXCGI must be fixed
-   in lynx.cfg.  It doesn't handle redirection or mime-types and
-   scripts should probably generate partial URLs when referring back to
-   itself.  If the file you're going after isn't an executable then it
-   will be loaded as regular file.  This makes it possible to go back
-   and forth between cgi-scripts and .html files.
-   I changed the way TRUSTED_LYNXCGIs are recorded because they don't
-   work quite the same as TRUSTED_EXECs do.  Also, George says it works
-   fine on SunOS and Solaris, and it seems to work fine on Linux. - CL
-  --------------------------------------------
-* Don't block access to the download menu when both no_download and
-  no_disk_save are set if any of the download commands have always_enabled
-  set (ie. present a reduced menu, with those still available). - FM
-* More tweaks of help and html files. - DSL
-07-26-95
-* Added support for GNUC in the VMS .com files.  Should now compile and link
-  automatically for GNUC via build.com, but that needs testing. - FM
-* Reorganized VMS option files into ones for the transport and ones for the
-  compiler, with corresponding updates of the .com and .mms files. - FM
-* Tweaks of mods for GNUC on VMS, based on further discussions with
-  SB. - FM
-* Tweaks of -help output. - Daniel S. Lewart (d-lewart@uiuc.edu)
-07-25-95
-* Ugh!!  Blew it for Unix when setting up the GLOBALDEF/GLOBALREF definitions
-  in tcp.h for VAXC vs. DECC vs. GNUC on VMS this morning (I'm a night
-  person 8-). - FM
-* Worked in code for compiling with the VMS port of GNUC, based on patches
-  from Sterling Bjorndahl (bjorndahl@augustana.ab.ca) and advice from
-  Pat Rankin (rankin@eql.caltech.edu).  Needs testing, and the linking
-  procedure still needs to be addressed explicitly. - FM
-* Prevent possibility of a null pointer dereference if an ISMAP anchor
-  fetch fails. - David Trueman (david@cs.dal.ca)
-07-21-95
-* Added LYK_HEAD (mapped by default to ']') to send HEAD requests for the
-  current document or link (always sent with LYforce_no_cache). - FM
-* More lynx.man, lynx.hlp, help file and documentation updates. - FM
-07-19-95
-* Put back "-mime_headers" with mods like those in lynx2-4-2, i.e., so that
-  a source dump is forced.  Both "-mine_headers" and "-head" show the status
-  line as well as the MIME headers. - FM
-* Modified "-error_file" to show the complete status line, as well as the
-  URL and METHOD, and to concatenate entries instead of creating separate
-  files for each request. - FM
-* Updated the lynx.man, lynx.hlp and lynx_help files. - FM
-07-18-95
-* Changed "-mime_headers" to "-head" and implemented it as a HEAD request
-  for fetching the MIME headers as text/plain. - FM
-07-17-95
-* Removed 00DIFFERENT from this distribution. - FM
-* Made use of _underline_ format in dumps optional via SUBSTITUTE_UNDERSCORES
-  definitions in userdefs.h and/or lynx.cfg, and added a "-underscore"
-  command line switch for toggling the default on or off. - FM
-* Use system("exec $SHELL") for spawning the default shell on Unix. - Paul
-  Gilmartin (pg@sweng.stortek.com)
-* Fixed typo in check for news vs. nntp URLs in HTNews.c. - Wilson Cheung
-  (wcheung@netcom.com)
-* Added code to the VMS setup() for dealing with curses conficts if someone
-  used -post_data or -get_data without specifying -dump under conditions
-  which require it, so it's not forced in LYMain.c as on Unix.  If fact,
-  -get_data and -post_data are very useful in interactive invokations. - FM
-* Fixed memory leak in the -post_data and -get_data handling. - FM
-* Added LYNX_HOST_NAME in userdefs.h and lynx.cfg for defining an alias
-  which will be treated equivalently to "localhost" and HTHostName (the
-  fully qualified domain name of the system running Lynx) in checks for
-  URLs on the local host (e.g., when the -localhost switch is set). - FM
-* Added in or improved descriptions for the new switches in the Lynx
-  command line help and Lynx_users_guide.html. - FM
-07-16-95
-* Tweaks of yesterday's startfile and -homepage mods, and added treatment
-  of '~' as SYS$LOGIN when used as the lead character on VMS (e.g., on
-  VMS as on Unix,  lynx ~/  will create a listing of the login directory
-  for the account running lynx). - FM
-* Worked in stuff from 13-Jul-95 lynx2-4-1 upgrade.  Most had already been
-  added to lynx2-4-FM.  This is the new stuff. - FM:
----------------------------------------------------
-   07-13-95
-* Added some command line patches from Peter Brooks - CL:
-  (pbrooks@micromind.com).  The new command lines are:
-	-post_data, -get_data = send form data from stdin and dumps results.
-	-auth=ID:PASSWD = sets authorization stuff at startup.
-	-mime_header = prints mime header with -source.
-	-noredir = prevents automatic redirection
-	-error_file=file = prints HTTP status code to file.  (Not sure of
-		his motivation on this one, something to do with SlipKnot,
-		I think.)
-	(Replaced Peter's strdup()'s with more portable code. - FM)
-   07-11-95
-* Added Erik Olson's (olson@phys.washngton.edu) patch to use the
-  _underline_ format when using the -dump option. - CL
-  (Kept the old code, #ifdef'ed out, to make this optional someday. - FM)
-   07-07-95
-* Fixed a bug in local_dired.  Specifically, a pointer to a fixed array
-  was being fed into StrAllocCopy as the destination.  Linux was choking
-  on this although OSF/1 and AIX seemed to handle it better. - CL
----------------------------------------------------
-07-15-95
-* If a command line "startfile" and/or -homepage is not a URL, and can't
-  be located as a file or directory on the local system, treat it as an
-  http URL, e.g., www.wfeb.edu will be treated as http://www.wfeb.edu - FM
-07-13-95
-* Added nntp URL handling (nntp://news_host[:port]/path).  Made it read
-  access only (use news URLs for both read and post access). - FM
-07-12-95
-* Added code for proxying https and snews URLs.  The Netsite proxy server
-  can proxy them without need for SSL code in the clients themselves, i.e.,
-  for Lynx as publically distributed (need client-resident SSL code and
-  tunneling for the CERN proxy server, sorry). - FM
-* Added the CONNECT protocol to our local code, so that SSL URLs can be
-  tunneled through proxy servers, and reorganized some code so that patches
-  for the SSL hooks can be applied easily if NSA regulations are relaxed. - FM
-07-11-95
-* More tweaks of alignment code. - FM
-* Fixed bad code for removing trailing white space in GridText.c, LYrcFile.c,
-  LYReadCFG.c and LYUtils.c. - FM
-* Added snews and nttp protocols, which simply inform the user that they
-  aren't implemented. - FM
-* The claim is that even mere hooks to the RSA and SSL libraries are
-  objectionable to the NSA, so I removed then from the public distribution,
-  but left in the https protocol, which simply informs the user that it
-  isn't implemented. - FM
-07-08-95
-* Worked in Lou Montulli's (montulli@netscape.com) code for https URL
-  handling into the Common Library.  To actually use it, you have to
-  get the RSA and SSL libraries, which are restricted to US citizens
-  (it works if you are and do 8-).  I can't include those in this
-  distribution, because by US law that would in turn restrict it to
-  US citizens. - FM
-* Tweaks of paragraph alignment code. - FM
-07-07-95
-* If we are not allowed to change the status of the "lynxexec
-  execution of links" from the option screen then we shouldn't be
-  allowed to change it from the .lynxrc file either. - GL
-* Added George Lindholm's patch to add uudecode support to Lynx's file
-  manager.  Unfortunately, uudecode puts the uudecoded file in the
-  current working directory, namely the directory where lynx is started.
-  I haven't thought of a workaround yet, so I made lynx print a
-  statusline message informing the user. - CL
-07-06-95
-* Modified redirection-handling code in HTTP.c to ensure that we get all of
-  the headers before trying to track down the Location: header. - FM
-* For move's or rename's in the local DIRED code, don't write the new file
-  name into the same buffer as the old. - Earl Fogel (fogel@duke.usask.ca)
-07-05-95
-* Added GL's mods to use a stream-based procedure for displaying the
-  current Lynx keymap.  Faster and more efficient than the temporary
-  file-based procedure. - FM
-07-04-95 (Enjoy the fireworks!!!  8-)
-* More mods of SGML/HTML parsing to help recover from bad HTML. - FM
-* Fixed some cryptic initialization problems in the Common Library's
-  centering and right alignment code, that we're now using, by changing
-  the malloc's in HTChunk.c to calloc's. - FM
-* Secured some unsafe code in the LYstrncpy() function. - FM
-* Increased the connect() and select() while()-looping limit in HTTCP.c
-  to 30,000 tries. - FM
-* Tweak of HR WIDTH attribute handling. - FM
-07-03-95
-* Updated the DTD structures and definitions for HR to HTML 3.0, plus
-  its Netscape WIDTH and SIZE attributes, and implemented WIDTH, e.g.,
-  HR WIDTH="50%" yields a centered horizontal rule half the width
-  between the current left and right margins. - FM
-* Fixed problem of header end tags not yielding line breaks when embedded
-  in CENTER, LEFT or RIGHT tags. - FM
-07-02-95
-* Added MAKE_PSEUDO_ALTS_FOR_INLINES in userdefs.h and lynx.cfg which can
-  be defined FALSE to treat inlines without an ALT string as having ALT=""
-  instead of inserting the pseudo-ALT string "[INLINE]" into the document.
-  The configuration file default can be toggled via a -pseudo_inlines
-  command line switch, and the user can toggle the inclusion of pseudo-ALT
-  strings on or off at run time via LYK_INLINE_TOGGLE (mapped by default
-  to '['). - FM
-* Made the -image_links command line switch a toggle for the configuration
-  file default setting. - FM
-* Enabled processing of forms that use TABLE for formatting.  I don't see any
-  risk of crashes, and they might end up usable.  Messages warn the user that
-  the display of the form may be strange. - FM
-* Relaxed anti-crash protections for forms with bad HTML (usually due
-  to interdigitated instead of embedded tags, written by providers with
-  Netscape or Mosaic clients, which are insensitive to such fundamentally
-  bad HTML).  I got the code to still work with several bad forms on the
-  Net, and if a crash should occur, the user has been tipped off via the
-  statusline or trace message about the nature of the problem. - FM
-07-01-95
-* Restored the meaning of the P element to be the beginning of a paragraph,
-  updated its structures and definitions in the DTD to HTML 3.0, and
-  implemented its ALIGN attribute (left, center, right).  Note that it
-  no longer forces double spacing (you'll get the spacing defined in
-  the stylesheet for the current element, which may or may not be
-  double) and empty paragraphs (serial Ps) will not yield additional
-  newlines (use serial BRs for that). - FM
-* If both download options and disk saves are restricted, don't fetch
-  binary files with a download offer when their links are activated
-  (just issue a statusline message that the file can't be displayed),
-  and issue a "disabled" statusline message for any overt 'd'ownload
-  attemps. - FM
-* For disk saves in LYDownload.c, on VMS attempt a rename() first, and then
-  a spawned DCL copy if that fails. - FM
-* Added memory exhaustion checks for all mallocs, reallocs and callocs in
-  the LYfoo modules. - FM
-* Added CL's realloc() substitute for AIX and ultrix in GridText.c. - FM
-* Map extensions .html3 and .ht3 to text/html in HTInit.c. - FM
-06-29-95
-* Added code to enable creation of links for all images.  Can be made the
-  default by setting MAKE_LINKS_FOR_ALL_IMAGES to TRUE in userdefs.h and/or
-  lynx.cfg (not advised).  Can be implemented for the session via a command
-  line switch, -image_links, e.g., use  lynx -dump -image_links  to get links
-  for all images, as well as standard links, listed in the output.  Can be
-  toggled on and off at run time via LYK_IMAGE_TOGGLE (mapped by default to
-  '*').  Use that in conjuction with the LYK_LIST command to get a list of
-  links that includes all images, e.g., for adding them as bookmarks.  The
-  toggle also invokes a reload, so that the change will be implemented for
-  the current and any future documents, but if you return to cached
-  documents, those will need to be reloaded explicitly.  See comments in
-  userdefs.h and lynx.cfg for more information. - FM
-* Don't restrict use of Control-T for toggling trace mode to advanced
-  usermode (i.e., make it available in all usermodes, so people might
-  follow the instructions in "BAD HTML" statusline messages to check
-  the document in trace mode). - FM
-* Modified LYList.c to indicate the anchor NAME/ID, if present, following
-  the TITLE, if known, in interactive 'l'ists.
-* Modified SGML.c to treat '>' as both a close-double-quote and close-tag.
-  Now Lynx acts like Netscape, in that respect, so all that bad HTML
-  Netscape users are generating will not bother Lynx. - FM
-06-28-95
-* Oops, missed an initialization in this morning's centering and right
-  alignment mods. - FM
-* Fixed up HTML.c to bypass HTML 3.0 attribute checks for start tags generated
-  by the Common Library's non-http access types (gopher, ftp, news, wais)
-  Could crash, otherwise.  - FM
-* Fixed up GridText.c code to take non-printing control characters properly
-  into account when formatting centered or right-aligned text. - FM
-* Mods to improve appropriate carryover or cancelling of alignment attributes
-  across successive elements. - FM
-* Implemented Netscape LEFT and RIGHT extensions, homologously to CENTER. - FM
-* Implemented Netscape BLINK extension as HT_UNDERLINE. - FM
-06-26-95
-* Updated the DTD structures and definitions for H1 - H6 to HTML 3.0 and
-  implemented their ALIGN attribute (left, right and center). - FM
-* Implemented the Netscape CENTER extension. - FM
-06-25-95
-* Updated the DTD structures and definitions for FORM, INPUT, TEXTAREA,
-  SELECT and OPTION to HTML 3.0. - FM
-* Implemented the HTML 3.0 DISABLED attribute for FORM elements. - FM
-* INPUT type "scribble" implemented as "text" according to the HTML 3.0
-  recommendation for non-GUI clients. - FM
-* Added protections against problems with INPUT types "range" and "file"
-  until they're implemented (will be tricky, but do-able 8-). - FM
-06-23-95
-* Added all ISO8859-1 entities to the DTD. - FM
-06-22-95
-* Updated the DTD structures and definitions for A and IMG to HTML 3.0, and
-  implemented their ID attribute. - FM
-* Tweaks of FIG handling. - FM
-* It is somehow inappropriate to teach our users to write correct HTML and
-  to tell them to always check it before publishing, when Lynx's on-line
-  help gives such a bad example :-} (not to mention versions from a couple
-  of months back).  Better now. - Mark Martinec (Mark.Martinec@nsc.ijs.si)
-06-20-95
-* Made the DTD structures and definitions for the HTML 3.0 elements
-  BQ, CAPTION, CREDIT, FIG, NOTE and OVERLAY complete, and added
-  those for STYLE, TABLE, TD, TH and TR.
-* Tweaks of yesterday's HTML 3.0 additions (still just "first pass"). - FM
-* Added code for avoiding potential problems with stylesheets and tables
-  in HTML 3.0 documents. - FM
-06-19-95
-* Added "first pass" handling of HTML 3.0 elements BQ, CAPTION, CREDIT,
-  FIG, NOTE and OVERLAY. - FM
-06-17-95
-* Close the configuration file on completion of the big while() in
-  LYReadCFG.c. - PM
-* Added 00DIFFERENT to keep track of files in this code set which
-  presently differ from those in the latest development code set
-  at UKans (currently, lynx2-4-1.zip of 15-Jun-95). - FM
-* Tweak of the pseudo-toolbar code.  The 'l'ist command now displays the
-  TITLE (or RelValue, if TITLE is defaulted) of those links if they have
-  never been accessed, or their actual HTML titles if accessed, at the
-  top of the links list, so you can use that command instead of LYK_HOME
-  to reach the toolbar links at any time, and then left-arrow to where
-  you were in the current document instead of having to page back down
-  to that location. - FM
-06-16-95
-* Added LINK REL="RelValue" HREF="foo" TITLE="TitleValue" HTML 3.0
-  handling (as in http://www.hpl.hp.co.uk/people/dsr/html3/dochead.html
-  of 28-Mar-95).  The HREF and REL values are required (the LINK will be
-  ignored if either is missing or has a zero-length value). TITLE is
-  optional, i.e., the RelValue will be used as the link name if TITLE
-  is omitted.  Currently registered toolbar RelValues are:  Home, ToC,
-  Index, Glossary, Copyright, Up, Next, Previous, Help, and Bookmark.
-  The Bookmark links are intended to have TITLEs (e.g., "Order Form").
-  The others have RelValues that yield self-evident link names.  The LINKs
-  should be placed in the HEAD section, so they'll be displayed in a manner
-  simulating a toolbar (but not a real one, since we don't have Windows and
-  mouse support; use your LYK_HOME command to access it at any time 8-).
-  The BODY should have a line-breaking element (e.g, H1) to set them off.
-  For now, the Banner RelValue is treated like another toolbar element.
-  The StyleSheet RelValue is ignored, since we don't yet have loadable
-  stylesheet handling. - FM
-* Fixed up the 06-13-95 NO_ANONYMOUS_EMAIL patch to be appropriate for
-  VMS - FM.
-06-14-95
-* Added LYK_LIST command ('l' or 'L'; must be uppercase if VI keys are on)
-  for creating an ACTIVATEable list of references (links) in the current
-  document.  If LINKS_ARE_NUMBERED is on, it's a UL, otherwise it's an
-  OL.  Visited links have the TITLE displayed, otherwise the HREF is
-  displayed. - FM
-* Added code to append a list of references (links), if present in the
-  document, when -dump is used.  Dumps are done with LINKS_ARE_NUMBERED
-  turned on.  The reference list is numbered, and always shows the HREFs,
-  so that they can be referenced to the links in the document. - FM
-* Updated help files. - FM
---- lynx2-4-1 on ftp2.cc.ukans.edu (added to lynx2-4-FM on 06-16-95)
-06-13-95
-* Added George Lindholm's patch to add -r (recurse) to the zip call in DIRED.
-  - JP
-06-12-95
-* Added George Lindholm's new file permission patch.  Here's his description:
-  "Here is a rewamped version of my earlier file permission patch.  This version
-   uses a html page to prompt for user input (rather than having the user
-   enter a obscure unix chmod string) using checkboxes." - JP
-* Added George Lindholm's addition of a compiler flag (NO_ANONYMOUS_EMAIL).
-  If NO_ANONYMOUS_EMAIL is set the user will not be able to add their own
-  from header.  This will only work if the mail package being used will
-  add this information. - JP
---- lynx2-4-1 on ftp2.cc.ukans.edu
-06-09-95
-* Replaced info.cern.ch with www.w3.org in html and make files.  Designated
-  this code as 2.4-FM, for local use. - FM
---- STARTING  2.4-FM ---
---- Rename of Lynx2-3-FM and release as Lynx2-4  (08-June-1995) ---
-    (see CHANGES2-4 and CHANGES2-3)
diff --git a/docs/FM.announce b/docs/FM.announce
deleted file mode 100644
index 0b2652bf..00000000
--- a/docs/FM.announce
+++ /dev/null
@@ -1,72 +0,0 @@
-LYNX FILE MANAGEMENT SUPPORT
-
-New facilities have been added since Lynx 2-3 to provide support
-for managing files on the local filesystem.  These facilities allow
-the user to delete, rename, and re-locate files and/or directories and
-to create and/or upload new files and directories.  This will mainly
-be of interest to systems administrators who are interested in running
-lynx as a restricted shell in order to provide controlled access to a
-range of services (as in a freenet). It may also be of use at sites
-where some of the users are experiencing difficulty with the raw Unix
-interface.
-
-Support for the new facilities is enabled at compile time by defining
-the variable `DIRED_SUPPORT' in the `MCFLAGS' list in the Lynx
-Makefile, and in the WWW makefile `CommonMakefile'.  Runtime support
-for disabling the facilities is provided by way of the restriction
-`dired_support' which can be set on the command line for a particular
-session.
-
-The Makefile also provides additional compile time flags for
-controlling the extent and application of the file management
-facilities; specifically, `OK_TAR' which enables support for creating
-and expanding tar archives, `OK_GZIP' which enables use of gzip to
-compress and decompress files, and `OK_OVERRIDE' which allows access
-to the file management facilities directly from the keyboard in
-addition to access by way of a file management menu.
-
-There are two possible modes of operation; the first in which a single
-file management menu is invoked via the `f', or `F' key; the second,
-in which the more often used facilities are made available directly
-from the keyboard in addition to access via the menu.  The second
-method provides a much better user interface but requires re-mapping
-some of the keys from their standard lynx interpretation, temporarily
-when file management mode is in effect.  For example, if OK_OVERRIDE is
-defined at compile-time, then the line at the bottom of the screen, in
-novice mode, will be
-
-  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload
-
-rather than the standard second noviceline,
-
-  H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list
-
-when the user is browsing part of the file system.  If OK_OVERRIDE is not
-defined then all access to file management functionality must be by way
-of the menu.  The only exception is that the facility to tag files for
-subsequent removal and/or re-location is always available directly from
-the keyboard using `t', and `T'.
-
-This is a first release of the file management enhancements and suggestions
-for improvements are welcome.  Among the enhancements which are currently
-being considered are facilities for changing file access attributes, and
-a facility for listing and extracting part of an archive.
-
-In order to use the file management facilities you may either point
-the program at a directory on the command line or point the program at
-an html file which contains a link of the following form:
-
-   <a href="file://localhost/~/"> Manage Personal Directory ? </a>
-
-where the anchor `file://localhost/~/' implies a reference to
-/home/username.  Because the `~/' in a file URL is converted to
-`/home/username' regardless of origin, these facilities also work when
-the anchor shown above is served from an http server as well.  In
-either case the reference is to files on the local system and not
-files in the domain of the server.
-
-By default the file listing is in standard Unix mixed format, but you
-may use the Options menu to select WWW `directories first' format, or
-`files first' format if you prefer.
-
-Rick Mallett, Carleton University, Ottawa Canada. (rmallett@ccs.carleton.ca)
diff --git a/docs/IBMPC-charsets.announce b/docs/IBMPC-charsets.announce
deleted file mode 100644
index 1431cdf3..00000000
--- a/docs/IBMPC-charsets.announce
+++ /dev/null
@@ -1,74 +0,0 @@
-
-Summary
-=======
-This document is primarily for people who will be using Lynx
-on a remote UNIX or VMS system via an MS-DOS based terminal program.
-
-
-General Information
-===================
-Lynx comes with built-in translation tables to map the 8-bit character codes or
-character entities coming in from an HTML document to their equivalent codes,
-where possible, for various character sets.
-
-IMPORTANT:  you should choose display character set in Lynx Options Menu
-according to your font installed locally.  Probably it would be cpXXX. Please
-contact lynx-dev mailing list if you want any new codepage not listed there.
-
-Note that all points of the connection between the display at your end and Lynx
-at the remote end must be 8-bit clean.  If the high bit is being stripped at
-any point in between, the only character set you can use (effectively) in Lynx
-will be "7 bit approximations".  More on that later.
-
-
-MS-DOS character set weirdness
-==============================
-MS-DOS uses a bass-ackwards character set in which half the normal characters
-have been replaced by pseudo-graphic line and box-drawing characters, and in
-which almost all of the international characters are mapped to nonstandard
-numbers.  It also contains Greek letters.
-
-Further confusing matters, there is more than one MS-DOS character set.  The
-character sets are referred to as "codepages," each of which has a unique
-number.  IBM PCs and compatibles come with one hardware-based default codepage
-and a keyboard to match.  In the US market the hardware codepage is 437.  PCs
-destined for other regions of the world often have a different default codepage
-which contains characters for other languages and keyboards.  Under MS-DOS, one
-can load different codepages into memory and use one of them instead of the
-hardware default.
-
-If you are using Lynx through an MS-DOS based terminal program or telnet
-client, you should use an appropriate DOS codepage in Lynx and you need not any
-translation within terminal program (this is different from old-style behavior
-and works better because of superior Lynx translation support).
-
-Check your display by accessing Martin Ramsch's ISO-8859-1 table
-(iso8859-1.html in the Lynx distribution's test subdirectory).
-
-Ramsch's table describes each entity and shows examples of each.  It should be
-immediately obvious that you are either seeing what you are supposed to, or
-you're not.  If you see box and line-drawing characters and mismatched letters
-and so on, you are likely displaying 7 bit data, not 8.  Ensure that all points
-of your connection are 8-bit clean:
-
-	On any remote UNIX systems you must pass through, do
-		'stty cs8 -istrip' or 'stty pass8'.  'stty -a' should list
-		your settings.
-	On any remote VMS systems, do 'set terminal /eightbit'.
-	Make sure your terminal program or telnet client is not filtering
-		8-bit data.  You may found the choice between "VT-100 strict"
-		and "VT-100 relaxed" emulation mode - use relaxed.
-		Note:  Procomm for DOS has a confusing "Use 7 bit or 8 bit
-		ANSI" setting -- this has to do with ANSI sequences.  If set to
-		8 bit, some 8-bit character sequences, including those passed
-		by Lynx as well as those which are for your terminal type
-		(vt100, etc.) will be processed by Procomm as ANSI screen
-		control codes and will most likely result in a garbled display.
-		Set it to 7 bit.
-	If going through a dialup terminal server, you may have to set the
-		terminal server itself to pass 8 bit data.  How to do this
-		varies with the make of the server, and in some cases only a
-		system admin in charge of the box will have the authorization
-		to do that.
-	SLIP or PPP connections should already be 8-bit clean.
-
diff --git a/docs/SOCKETSHR.announce b/docs/SOCKETSHR.announce
deleted file mode 100644
index 4c08a018..00000000
--- a/docs/SOCKETSHR.announce
+++ /dev/null
@@ -1,67 +0,0 @@
-LYNX SUPPORT FOR SOCKETSHR/NETLIB			28-AUG-1996
----------------------------------
-
-
-What is SocketShr?
-------------------
-
-SOCKETSHR is Eckhart Meyer's socket library interface to the MadGoat NETLIB
-package, which provides a vendor-independent interface to the VMS TCP/IP
-transports.  Using this, the same image will run over any of the available
-packages, including UCX, Multinet, CMU, Pathway access and TCPWARE.
-
-SocketShr and NETLIB are separately available libraries that MUST be installed
-before LYNX can use them.
-
-
-How to get NETLIB and SOCKETSHR
--------------------------------
-
-FTP:
-
-   ftp://ftp.kcl.ac.uk/default/socketshr.*
-   ftp://ftp.wku.edu/fileserv/socketshr.zip
-   ftp://ftp.spc.edu/macro32/savesets/socketshr.zip
-
-   ftp://ftp.kcl.ac.uk/madgoat/netlib.*
-   ftp://ftp.wku.edu/madgoat/netlib017.zip
-   ftp://ftp.spc.edu/macro32/savesets/netlib017.zip
-
-
-By E-Mail:
-   send the following commands in a mail message:
-
-     SEND SOCKETSHR.PACKAGE
-     SEND NETLIB.PACKAGE
-
-   To:
-     vmsserv @ kcl.ac.uk
-
-Other server's may also contain these packages.
-
-NETLIB is copyright of MadGoat Software; SOCKETSHR is copyright of Eckhart
-meyer.
-
-
-Preliminary Setup of SOCKETSHR
-------------------------------
-
-Once SOCKETSHR has been installed, TWO logical names should be defined:
-
-    SOCKETSHR 		Point to the appropriate shareable image
-    SOCKETSHR_LIBRARY	Point to the directory containing SOCKETSHR.H
-    			and IOCTL.H
-
-Both should be defined /system /exec
-
-
-Building LYNX
--------------
-
-Run the BUILD.COM procedures and select the SOCKETSHR_TCP option.  This will
-build an image that will run over the SOCKETSHR/NETLIB routines.
-
-
-Andy Harper
-Kings College London
-A.Harper@bay.cc.kcl.ac.uk
diff --git a/docs/djgpp.key b/docs/djgpp.key
deleted file mode 100644
index 0ce8631a..00000000
--- a/docs/djgpp.key
+++ /dev/null
@@ -1,214 +0,0 @@
-                      DJGPP Keyhandler Keymaps
-
-Control_A            0x001
-Control_B            0x002
-Control_C            0x003
-Control_D            0x004
-Control_E            0x005
-Control_F            0x006
-Control_G            0x007
-BackSpace            0x008
-Control_H            0x008
-Tab                  0x009
-Control_I            0x009
-LineFeed             0x00a
-Control_J            0x00a
-Control_K            0x00b
-Control_L            0x00c
-Return               0x00d
-Control_M            0x00d
-Control_N            0x00e
-Control_O            0x00f
-Control_P            0x010
-Control_Q            0x011
-Control_R            0x012
-Control_S            0x013
-Control_T            0x014
-Control_U            0x015
-Control_V            0x016
-Control_W            0x017
-Control_X            0x018
-Control_Y            0x019
-Control_Z            0x01a
-Control_LBracket     0x01b
-Escape               0x01b
-Control_BackSlash    0x01c
-Control_RBracket     0x01d
-Control_Caret        0x01e
-Control_Underscore   0x01f
-Space                0x020
-ExclamationPoint     0x021
-DoubleQuote          0x022
-Hash                 0x023
-Dollar               0x024
-Percent              0x025
-Ampersand            0x026
-Quote                0x027
-LParen               0x028
-RParen               0x029
-Star                 0x02a
-Plus                 0x02b
-Comma                0x02c
-Dash                 0x02d
-Period               0x02e
-Slash                0x02f
-Colon                0x03a
-SemiColon            0x03b
-LAngle               0x03c
-Equals               0x03d
-RAngle               0x03e
-QuestionMark         0x03f
-At                   0x040
-LBracket             0x05b
-BackSlash            0x05c
-RBracket             0x05d
-Caret                0x05e
-UnderScore           0x05f
-BackQuote            0x060
-LBrace               0x07b
-Pipe                 0x07c
-RBrace               0x07d
-Tilde                0x07e
-Control_Backspace    0x07f
-BackTab              0x10f
-Alt_Q                0x110
-Alt_W                0x111
-Alt_E                0x112
-Alt_R                0x113
-Alt_T                0x114
-Alt_Y                0x115
-Alt_U                0x116
-Alt_I                0x117
-Alt_O                0x118
-Alt_P                0x119
-Alt_LBracket         0x11a
-Alt_RBracket         0x11b
-Alt_Return           0x11c
-Alt_A                0x11e
-Alt_S                0x11f
-Alt_D                0x120
-Alt_F                0x121
-Alt_G                0x122
-Alt_H                0x123
-Alt_J                0x124
-Alt_K                0x125
-Alt_L                0x126
-Alt_Semicolon        0x127
-Alt_Quote            0x128
-Alt_Backquote        0x129
-Alt_Backslash        0x12b
-Alt_Z                0x12c
-Alt_X                0x12d
-Alt_C                0x12e
-Alt_V                0x12f
-Alt_B                0x130
-Alt_N                0x131
-Alt_M                0x132
-Alt_Comma            0x133
-Alt_Period           0x134
-Alt_Slash            0x135
-Alt_KPStar           0x137
-F2                   0x13c
-F3                   0x13d
-F4                   0x13e
-F5                   0x13f
-F6                   0x140
-F7                   0x141
-F8                   0x142
-F9                   0x143
-F10                  0x144
-Alt_KPMinus          0x14a
-Center               0x14c
-Alt_KPPlus           0x14e
-Shift_F1             0x154
-Shift_F2             0x155
-Shift_F3             0x156
-Shift_F4             0x157
-Shift_F5             0x158
-Shift_F6             0x159
-Shift_F7             0x15a
-Shift_F8             0x15b
-Shift_F9             0x15c
-Shift_F10            0x15d
-Control_F1           0x15e
-Control_F2           0x15f
-Control_F3           0x160
-Control_F4           0x161
-Control_F5           0x162
-Control_F6           0x163
-Control_F7           0x164
-Control_F8           0x165
-Control_F9           0x166
-Control_F10          0x167
-Alt_F1               0x168
-Alt_F2               0x169
-Alt_F3               0x16a
-Alt_F4               0x16b
-Alt_F5               0x16c
-Alt_F6               0x16d
-Alt_F7               0x16e
-Alt_F8               0x16f
-Alt_F9               0x170
-Alt_F10              0x171
-Control_Print	     0x172
-Control_Left         0x173
-Control_Right        0x174
-Control_End          0x175
-Control_PageDown     0x176
-Control_Home         0x177
-Alt_1                0x178
-Alt_2                0x179
-Alt_3                0x17a
-Alt_4                0x17b
-Alt_5                0x17c
-Alt_6                0x17d
-Alt_7                0x17e
-Alt_8                0x17f
-Alt_9                0x180
-Alt_0                0x181
-Alt_Dash             0x182
-Alt_Equals           0x183
-Control_PageUp       0x184
-F11                  0x185
-F12                  0x186
-Shift_F11            0x187
-Shift_F12            0x188
-Control_F11          0x189
-Control_F12          0x18a
-Alt_F11              0x18b
-Alt_F12              0x18c
-Control_Up           0x18d
-Control_KPDash       0x18e
-Control_Center       0x18f
-Control_KPPlus       0x190
-Control_Down         0x191
-Control_Insert       0x192
-Control_Delete       0x193
-Control_KPSlash      0x195
-Control_KPStar       0x196
-Alt_EHome            0x197
-Alt_EUp              0x198
-Alt_EPageUp          0x199
-Alt_ELeft            0x19b
-Alt_ERight           0x19d
-Alt_EEnd             0x19f
-Alt_EDown            0x1a0
-Alt_EPageDown        0x1a1
-Alt_EInsert          0x1a2
-Alt_EDelete          0x1a3
-Alt_KPSlash          0x1a4
-Alt_Tab              0x1a5
-Alt_Enter            0x1a6
-Alt_Escape           0x1a7
-Control_At           0x1a8
-Alt_Backspace        0x1a9
-Control_ELeft        0x273
-Control_ERight       0x274
-Control_EEnd         0x275
-Control_EPageDown    0x276
-Control_EHome        0x277
-Control_EPageUp      0x284
-Control_EUp          0x28d
-Control_EDown        0x291
-Control_EInsert      0x292
-Control_EDelete      0x293
diff --git a/docs/slang.key b/docs/slang.key
deleted file mode 100644
index 73108802..00000000
--- a/docs/slang.key
+++ /dev/null
@@ -1,4 +0,0 @@
-                   S-Lang Keymaps for DOS
-
-F0		0x200
-F(X)		(SL_KEY_F0 + X) /* If X>1 */
diff --git a/lynx.cfg b/lynx.cfg
index 044be59a..333897b4 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,4 +1,4 @@
-# $LynxId: lynx.cfg,v 1.163 2008/09/21 23:29:28 tom Exp $
+# $LynxId: lynx.cfg,v 1.165 2008/12/07 21:05:49 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
@@ -2205,6 +2205,7 @@ MINIMAL_COMMENTS:TRUE
 #                      (the first for filenames with a dot somewhere in
 #                      the name, the second without), these are currently
 #                      mapped to text/plain in the (HTInit.c) builtin code.
+#                      Lynx compares the file-extensions ignoring case.
 #
 #     <mime type> a MIME content type.  It can also contain a charset
 #                 parameter, see example below.  This should be given in
@@ -3381,6 +3382,10 @@ COLOR:6:brightred:black
 # Specifies (in seconds) connect timeout. Default value is rather huge.
 #CONNECT_TIMEOUT:18000
 
+.h2 READ_TIMEOUT
+# Specifies (in seconds) read-timeout. Default value is rather huge.
+#READ_TIMEOUT:18000
+
 
 .h1 Internal Behavior
 # These settings control internal lynx behavior - the way it interacts with the
diff --git a/lynx.hlp b/lynx.hlp
index 6cf93f5b..4249b186 100644
--- a/lynx.hlp
+++ b/lynx.hlp
@@ -54,8 +54,8 @@
        ignored.
 
        The  default boolean, number and string option values that are compiled
-       into lynx are displayed in the help-message  provided  by  lynx  -help.
-       Some  of those may differ according to how lynx was built; see the help
+       into Lynx are displayed in the help-message  provided  by  lynx  -help.
+       Some  of those may differ according to how Lynx was built; see the help
        message itself for these values.  The -help option is processed  before
        any  option,  including  those  that  control reading from the lynx.cfg
        file.  Therefore runtime configuration values are not reflected in  the
@@ -80,7 +80,7 @@
               charset for documents that don't specify it.
 
        -assume_local_charset=MIMEname
-              charset  assumed for local files, i.e., files which lynx creates
+              charset  assumed for local files, i.e., files which Lynx creates
               such as internal pages for the options menu.
 
        -assume_unrec_charset=MIMEname
@@ -446,6 +446,9 @@
 
        -realm restricts access to URLs in the starting realm.
 
+       -read_timeout=N
+              Sets the read-timeout, where N is given in seconds.
+
        -reload
               flushes the cache on a proxy server  (only  the  first  document
               affected).
@@ -717,14 +720,16 @@
               WATT-32.
 
        -width=NUMBER
-              number of columns for formatting of dumps, default is 80.
+              number  of columns for formatting of dumps, default is 80.  This
+              is limited by the number of columns  that  Lynx  could  display,
+              typically 1024 (the MAX_LINE symbol).
 
        -with_backspaces
               emit backspaces in output if -dump'ing or -crawl'ing (like `man'
               does)
 
        -xhtml_parsing
-              tells lynx that it can ignore certain tags which have no content
+              tells Lynx that it can ignore certain tags which have no content
               in an XHTML 1.0 document.  For example "<p/>" will be discarded.
 
 2 Commands
@@ -771,7 +776,7 @@
                            more information.
 
        LYNX_HELPFILE       If set, this variable overrides the compiled-in URL
-                           and configuration file URL for the lynx help  file.
+                           and configuration file URL for the Lynx help  file.
 
        LYNX_LOCALEDIR      If  set,  this  variable  overrides the compiled-in
                            location of the  locale  directory  which  contains
diff --git a/lynx.man b/lynx.man
index 424dc4ad..b5db01ce 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,4 +1,4 @@
-.\" $LynxId: lynx.man,v 1.81 2008/09/10 13:09:54 tom Exp $
+.\" $LynxId: lynx.man,v 1.83 2008/12/07 22:41:13 tom Exp $
 .nr N -1
 .nr D 5
 .TH LYNX 1
@@ -87,8 +87,8 @@ e.g.,
 Other option-values are ignored.
 .PP
 The default boolean, number and string option values that are compiled
-into lynx are displayed in the help-message provided by \fBlynx -help\fP.
-Some of those may differ according to how lynx was built;
+into \fILynx\fP are displayed in the help-message provided by \fBlynx -help\fP.
+Some of those may differ according to how \fILynx\fP was built;
 see the help message itself for these values.
 The \fB-help\fP option is processed before any option, including those
 that control reading from the lynx.cfg file.
@@ -115,7 +115,7 @@ charset for documents that don't specify it.
 .TP
 .B \-assume_local_charset\fR=\fIMIMEname
 charset assumed for local files,
-i.e., files which lynx creates such as internal pages for the options menu.
+i.e., files which \fILynx\fP creates such as internal pages for the options menu.
 .TP
 .B \-assume_unrec_charset\fR=\fIMIMEname
 use this instead of unrecognized charsets.
@@ -512,6 +512,9 @@ or CJK mode for the startup character set.
 .B \-realm
 restricts access to URLs in the starting realm.
 .TP
+.B \-read_timeout\fR=\fIN
+Sets the read-timeout, where N is given in seconds.
+.TP
 .B \-reload
 flushes the cache on a proxy server
 (only the first document affected).
@@ -839,12 +842,14 @@ This applies only to DOS versions compiled with WATTCP or WATT-32.
 .TP
 .B \-width\fR=\fINUMBER
 number of columns for formatting of dumps, default is 80.
+This is limited by the number of columns that \fILynx\fP could display,
+typically 1024 (the \fIMAX_LINE\fP symbol).
 .TP
 .B \-with_backspaces
 emit backspaces in output if \fB\-dump\fR'ing or \fB\-crawl\fR'ing (like 'man' does)
 .TP
 .B \-xhtml_parsing
-tells lynx that it can ignore certain tags which have no content
+tells \fILynx\fP that it can ignore certain tags which have no content
 in an XHTML 1.0 document.
 For example "<p/>" will be discarded.
 .SH COMMANDS
@@ -897,7 +902,7 @@ See the userdefs.h file for more information.
 .TP
 .B LYNX_HELPFILE
 If set, this variable overrides the compiled-in URL and configuration
-file URL for the lynx help file.
+file URL for the \fILynx\fP help file.
 .TP
 .B LYNX_LOCALEDIR
 If set, this variable overrides the compiled-in location of the
diff --git a/lynx.rsp b/lynx.rsp
index b6b38401..dacdf393 100644
--- a/lynx.rsp
+++ b/lynx.rsp
@@ -71,7 +71,9 @@
 ../obj/LYStrings.obj
 ../obj/LYTraversal.obj
 ../obj/LYUpload.obj
+../obj/LYmktime.obj
 ../obj/LYrcFile.obj
+../obj/parsdate.obj
 ../obj/SGML.obj
 ../obj/TRSTable.obj
 ../obj/UCAuto.obj
diff --git a/makefile.bcb b/makefile.bcb
index 4052bc10..daa4ec11 100644
--- a/makefile.bcb
+++ b/makefile.bcb
@@ -1,4 +1,4 @@
-# $LynxId: makefile.bcb,v 1.11 2008/01/08 00:53:05 tom Exp $
+# $LynxId: makefile.bcb,v 1.12 2008/09/23 00:10:14 tom Exp $
 #
 # Borland C++ / C++ builder
 # 1997/11/08 (Sat) 10:45:37
@@ -48,6 +48,7 @@ CC_FLAGS = $(DEBUG) $(CS_DEFS) $(SOCK_DEFS) \
 -DCOLOR_CURSES \
 -DDIRED_SUPPORT \
 -DDISP_PARTIAL \
+-DDONT_HAVE_TM_GMTOFF \
 -DDOSPATH \
 -DEXP_ALT_BINDINGS \
 -DEXP_CMD_LOGGING \
@@ -174,7 +175,9 @@ Dep_lynxdexe = \
    $(OBJ)/LYTraversal.obj\
    $(OBJ)/LYUpload.obj\
    $(OBJ)/LYUtils.obj\
+   $(OBJ)/LYmktime.obj\
    $(OBJ)/LYrcFile.obj\
+   $(OBJ)/parsdate.obj\
    $(OBJ)/SGML.obj\
    $(OBJ)/TRSTable.obj\
    $(OBJ)/UCAuto.obj\
@@ -544,6 +547,11 @@ $(OBJ)/LYPrettySrc.obj :  src/LYPrettySrc.c
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYPrettySrc.c
 |
 
+$(OBJ)/LYmktime.obj :  src/LYmktime.c
+  $(BCC32) -P- -c @&&|
+ $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYmktime.c
+|
+
 $(OBJ)/LYrcFile.obj :  src/LYrcFile.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYrcFile.c
@@ -594,6 +602,11 @@ $(OBJ)/LYUtils.obj :  src/LYUtils.c
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/LYUtils.c
 |
 
+$(OBJ)/parsdate.obj :  src/parsdate.c
+  $(BCC32) -P- -c @&&|
+ $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/parsdate.c
+|
+
 $(OBJ)/TRSTable.obj :  src/TRSTable.c
   $(BCC32) -P- -c @&&|
  $(CEAT_lynxdexe) $(CC_FLAGS) -o$@ src/TRSTable.c
diff --git a/makefile.msc b/makefile.msc
index ede39816..f6f7e23e 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -1,4 +1,4 @@
-# $LynxId: makefile.msc,v 1.17 2008/01/08 00:53:14 tom Exp $
+# $LynxId: makefile.msc,v 1.18 2008/09/22 21:44:21 tom Exp $
 #
 # Makefile for `Lynx' browser for Microsoft Visual C++ 4.2 or later
 #
@@ -71,6 +71,7 @@ DEFS = $(CS_DEFS) $(SOCK_DEFS) $(SSL_DEFS) $(SCREEN_DEFS) \
  /D "CJK_EX" \
  /D "DIRED_SUPPORT" \
  /D "DISP_PARTIAL" \
+ /D "DONT_HAVE_TM_GMTOFF" \
  /D "DOSPATH" \
  /D "EXP_ALT_BINDINGS" \
  /D "EXP_CMD_LOGGING" \
@@ -196,7 +197,9 @@ OBJS = $(CS_OBJS) \
 	"LYTraversal.obj" \
 	"LYUpload.obj" \
 	"LYUtils.obj" \
+	"parsdate.obj" \
 	"LYexit.obj" \
+	"LYmktime.obj" \
 	"LYrcFile.obj" \
 	"SGML.obj" \
 	"TRSTable.obj" \
@@ -331,6 +334,9 @@ LYPrettySrc.obj : $(SRC_DIR)\LYPrettySrc.c
 LYPrint.obj : $(SRC_DIR)\LYPrint.c
 	$(COMPILE) $(SRC_DIR)\LYPrint.c
 
+LYmktime.obj : $(SRC_DIR)\LYmktime.c
+	$(COMPILE) $(SRC_DIR)\LYmktime.c
+
 LYrcFile.obj : $(SRC_DIR)\LYrcFile.c
 	$(COMPILE) $(SRC_DIR)\LYrcFile.c
 
@@ -361,6 +367,9 @@ LYUpload.obj : $(SRC_DIR)\LYUpload.c
 LYUtils.obj : $(SRC_DIR)\LYUtils.c
 	$(COMPILE) $(SRC_DIR)\LYUtils.c
 
+parsdate.obj : $(SRC_DIR)\parsdate.c
+	$(COMPILE) $(SRC_DIR)\parsdate.c
+
 TRSTable.obj : $(SRC_DIR)\TRSTable.c
 	$(COMPILE) $(SRC_DIR)\TRSTable.c
 
diff --git a/po/ca.po b/po/ca.po
index 35d3bf1a..b7f44b31 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: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\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"
@@ -2164,7 +2164,7 @@ msgstr ""
 " Escriviu el missatge a partir d'ací."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2173,7 +2173,7 @@ msgstr ""
 " Quan acabeu, premeu <intro> i escriviu només un punt (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2807,7 +2807,7 @@ msgstr "El document amb contingut POST no s'ha trobat en la memòria cau. Reenvia
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Càrrega incompleta."
 
@@ -2830,7 +2830,7 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "No ha estat possible accedir-hi"
 
@@ -3034,7 +3034,7 @@ msgstr "L'adreça conté un port que no és vàlid"
 msgid "Address length looks invalid"
 msgstr "La longitud de l'adreça sembla invàlida"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ha estat impossible trobar el servidor %s."
@@ -3043,40 +3043,41 @@ 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:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Servidor %s no vàlid"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Establint una connexió %s amb %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "La connexió ha fallat (massa reintents)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr ""
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "La connexió ha fallat (massa reintents)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3485,34 +3486,34 @@ msgstr ""
 msgid "unknown form field"
 msgstr "camp de formulari desconegut"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "No ha estat possible obrir el fitxer que voleu carregar."
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Enviant %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Trencar les línies per a ajustar a l'espai disponible?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Les línies molt llargues han estat tallades!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "Les línies molt llargues han estat truncades!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "bytes"
 
@@ -3687,7 +3688,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "El fitxer es podrà recuperar des de %s durant aquesta sessió"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3696,23 +3697,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Ha estat impossible d'accedir al script cgi"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Bon consell"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Un servidor http excel·lent per a VMS està disponible "
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "ací"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Dóna informació del estat actual del suport per a scripts CGI.\n"
 
@@ -3942,272 +3943,272 @@ msgstr "Referències"
 msgid "Visible links"
 msgstr "Enllaços visibles"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Ha estat impossible obtenir l'estat de \"%s\"."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "L'element triat no és ni un fitxer ni un directori! Sol·licitud ignorada."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Ha estat impossible %s a causa d'un error del sistema!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "eliminar %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr ""
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "moure %s a %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Ja existeig un directori amb aqueix nom! Sol·licitud ignorada."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Ja existeix un fitxer amb aqueix nom! Sol·licitud ignorada."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "El nom especificat ja s'està usant! Sol·licitud ignorada. "
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "La destinació té un propietari diferent! Sol·licitud denegada."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "La destinació no és un directori vàlid! Sol·licitud denegada."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Esborrar tots els fitxers i directoris indicats?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Introduïu la nova ubicació per als elements indicats: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Camí massa llarg"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "L'origen i la destinació coincideixen: sol·licitud ignorada!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Introduïu el nou nom del directori: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Introduïu el nou nom del directori: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "S'ha trobat un caràcter il·legal (separador de camí). Sol·licitudignorada"
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Introduïu la nova ubicació per al directori: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Introduïu la nova ubicació per al fitxer: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Error inesperat: ha estat impossible trobar el separador de camí"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "L'origen i la destinació coincideixen! Sol·licitud ignorada!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Modificar nom, ubicació o permisos (n, l, p): "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Modificar nom o ubicació (n, l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Aquesta característica no està encara disponible!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Introduïu el nom del fitxer que voleu crear: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "S'ha trobat una redirecció il·legal \"//\"! Sol·licitud ignorada."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Introduïu el nom del nou directori: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Crear un fitxer o un directori (f, d): "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, fuzzy, c-format
 msgid "Remove directory '%s'?"
 msgstr "Voleu eliminar l'arxiu '%s'?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
 msgstr " directori"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Voleu eliminar l'arxiu '%s'?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Voleu eliminar l'arxiu?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Voleu eliminar l'enllaç simbòlic '%s'?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Voleu eliminar l'enllaç simbòlic?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Lynx, de moment, no pot gestionar els permisos de fitxers no-UNIX."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "No s'ha pogut obrir el fitxer d'opcions de permisos"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Especifiqueu els permisos:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Propietari:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Grup"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Altres:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Format invàlid."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Sintaxi incorrecta."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr ""
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr ""
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Executant %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Executant una ordre del sistema. Pot tardar una mica."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Directori actual:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Selecció actual:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Actualment no hi ha res seleccionat."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "element marcat:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "elements marcats:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Nom de fitxer il·legal; sol·licitud ignorada."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Està prohibida la instal·lació en el directori que heu triat."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "L'element que heu triat no és un directori! Solicitud ignorada."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Un moment..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr ""
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "L'origen i la destinació són el mateix: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "És aquest, el directori de destinació: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Instal·lació completada"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "La URL temporal o la llista serien massa llargues."
 
@@ -4246,20 +4247,20 @@ msgstr "Aquest missatge va ser generat automàticament per"
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "No s'ha trobat Winsock."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 #, fuzzy
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Heu de definir una àrea TMP o TEMP vàlida!\n"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "No existeix el directori"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4270,7 +4271,7 @@ msgstr ""
 "El fitxer de configuració %s no està disponible\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4280,7 +4281,7 @@ msgstr ""
 "\n"
 "Els jocs de caràcters no estan declarats.\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4288,7 +4289,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4299,73 +4300,73 @@ msgstr ""
 "El fitxer %s no està disponible.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Alerta:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "l'estat de les cookies persistents no es canviarà fins la següent sessió"
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: joc de caràcters %s no reconegut. S'ignorarà.\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versió %s (%s)\n"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Compilat per a %s el %s a les %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr ""
 "Els drets de còpia pertanyen a la Universitat de Kansas, el CERN i altres\n"
 "contribuïdors.\n"
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Distribuït sota la Llicència Pública General.\n"
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 #, fuzzy
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 "Vegeu http://lynx.browser.org/ i l'ajuda en línia per a més informació.\n"
 "\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "UTILITZACIÓ: %s [opcions] [arxiu]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Les opcions són:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: l'opció no és vàlida: %s\n"
@@ -4394,7 +4395,7 @@ msgstr "Pantalla d'ajuda"
 msgid "System Index"
 msgstr "Índex del sistema"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Entrar en la pantalla principal"
 
@@ -4418,65 +4419,65 @@ msgstr "Un component del camí no és un directori"
 msgid "failed to change directory"
 msgstr "no ha estat possible canviar de directori"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Tornant a analitzar el document amb les opcions actuals..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Error fatal: no s'ha pogut obrir el fitxer d'eixida %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "La URL actual és buida."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "No s'ha pogut copiar al porta-retalls."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "La URL del document s'ha copiat al porta-retalls."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "La URL de l'enllaç s'ha copiat al porta-retalls."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "No hi ha cap URL al porta-retalls."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-índex-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: No s'ha pogut accedir al fitxer inicial"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: No s'ha trobat el fitxer o no és text/html ni text/plain"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Eixint..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-més-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr ""
 
@@ -4484,7 +4485,7 @@ msgstr ""
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4498,7 +4499,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4508,7 +4509,7 @@ msgstr ""
 "\n"
 " Per favor indiqueu o editeu l'assumpte\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4521,7 +4522,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4531,7 +4532,7 @@ msgstr ""
 "\n"
 " Per favor, introduïu el missatge."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "El missatge no conté text original!"
 
@@ -5199,38 +5200,38 @@ msgstr "Lynx: impossible iniciar, el fitxer de regles del CERN %s no estàdisponi
 msgid "(no name)"
 msgstr "(sense nom)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Més de %d includes imbricats en lynx.cfg: potser hi ha un bucle?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "L'últim include ha estat \"%s\", \n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inclós des de \"%s\".\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Les dades següents s'han llegit del vostre fitxer lynx.cfg."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Per favor, llegiu "
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "si necessiteu més informació."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "RECARREGAR ELS CANVIS"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Configuració primària"
 
@@ -5266,27 +5267,27 @@ msgstr "Element que heu triat"
 msgid "Full name:"
 msgstr "Nom complet:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Ha estat impossible seguir l'enllaç"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Apunta al fitxer:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Nom del propietari:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Nom del grup:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Grandària:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 #, fuzzy
 msgid "(bytes)"
 msgstr "bytes"
@@ -5294,162 +5295,162 @@ msgstr "bytes"
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Data de creació:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Última modificació:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Últim accés:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Permisos d'accés"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 #, fuzzy
 msgid "Group:"
 msgstr "Grup"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Fitxer que veieu actualment"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Nom:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Joc de caràcters:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Data:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Últ. mod.:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 #, fuzzy
 msgid "Expires:"
 msgstr "&nbsp;Expira:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr ""
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Idioma:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr ""
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr ""
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Propietari(s):"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "grandària:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "línies"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr ""
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "font"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ""
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ""
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ""
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ""
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ""
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "mode:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Enllaç triat"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Mètode:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr ""
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 #, fuzzy
 msgid "Action:"
 msgstr "Ubicació: "
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Camp de formulari)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "No hi ha enllaços en aquesta pàgina"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 #, fuzzy
 msgid "Server Headers:"
 msgstr "Servidor:"
@@ -5497,33 +5498,33 @@ msgstr "Carregar a:"
 msgid "Upload options:"
 msgstr "Opcions de càrrega:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "Massa fitxers temporals"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "restricció desconeguda"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "No s'hi han establert restriccions.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Restriccions:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 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 d2ab95eb..5eb3a357 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 2000-07-09 13:30+0200\n"
 "Last-Translator: Jiøí Pavlovský  <pavlovsk@ff.cuni.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -2158,7 +2158,7 @@ msgstr ""
 " Zadejte text va¹í zprávy."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2167,7 +2167,7 @@ msgstr ""
 " A¾ budete hotov, stisknìte enter a napi¹te jednu teèku (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2809,7 +2809,7 @@ msgstr "Dokument s POST obsahem nenalezen v cache. Odeslat znovu?"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Nahrávání dokonèeno."
 
@@ -2832,7 +2832,7 @@ msgstr "**** HTAccess: Návratový status: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Nelze získat pøístup"
 
@@ -3037,7 +3037,7 @@ msgstr "Adresa má chybný port."
 msgid "Address length looks invalid"
 msgstr "Délka adresy se zdá být chybnou."
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Adresu poèítaèe %s nelze zjistit."
@@ -3046,40 +3046,41 @@ msgstr "Adresu poèítaèe %s nelze zjistit."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Jméno poèítaèe %s je chybné"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Navazuji %s spojení s %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "chyba soketu."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Soket nelze nastavit jako neblokující."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "Spojení se nepodaøilo navázat (pøíli¹ mnoho pokusù)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Soket nelze nastavit jako blokující."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "180 000 neúspì¹ných pokusù èíst ze soketu."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Spojení se nepodaøilo navázat (pøíli¹ mnoho pokusù)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3496,35 +3497,35 @@ msgstr "pole pro vytvoøení klíèe"
 msgid "unknown form field"
 msgstr "neznámé pole formuláøe"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Soubor nelze pro ètení otevøít!"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Odesílám %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Zalamovat dlouhé øádky, aby se ve¹ly na obrazovku?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Pøíli¹ dlouhé øádky byly zalomeny!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "Pøíli¹ dlouhé øádky byly oøezány!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "bajtù"
 
@@ -3695,7 +3696,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Bìhem tohoto sezení lze soubor obnovit z %s."
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3704,23 +3705,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Nelze získat pøístup k cgi skriptu"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Dobrá rada"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Vynikající http server pro VMS je dostupný pøes"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "tento odkaz."
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Poskytuje výbornou podporu pro cgi skripty.\n"
 
@@ -3953,273 +3954,273 @@ msgstr "Reference"
 msgid "Visible links"
 msgstr "Viditelné odkazy"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Status '%s' nelze zjistit."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Vybraný pøedmìt není souborem ani adresáøem! Po¾adavek ignorován."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "%s selhalo kvùli systémové chybì!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "%s pravdìpodobnì selhalo kvùli systémové chybì!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "smazat %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr ""
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "pøesunout %s do %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Byl nalezen adresáø stejného jména! Po¾adavek ignorován."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Byl nalezen soubor stejného jména! Po¾adavek ignorován."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Zadané jméno je ji¾ pou¾íváno! Po¾adavek ignorován."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "Cíl má jiného vlastníka! Po¾adavek zamítnut."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Cíl není platným adresáøem! Po¾adavek zamítnut."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Smazat v¹echny oznaèené soubory a adresáøe?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Zadejte nové místo urèení pro oznaèené pøedmìty: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Cesta je pøíli¹ dlouhá."
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Zdroj a cíl oznaèují jedno a to samé místo - po¾adavek zamítnut!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Zadejte nové jméno adresáøe: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Zadejte nové jméno souboru: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Nalezen chybný znak (oddìlovaè cesty)! Po¾adavek ignorován."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Zadejte nové místo urèení pro adresáø: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Zadejte nové místo urèení pro soubor: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Neoèekávaná chyba - koncový oddìlovaè cesty nelze nalézt"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Zdroj a cíl oznaèují jedno a to samé místo - po¾adavek zamítnut!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Zmìnit jméno, umístìní èi pøístupová práva? (n,l èi p): "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Zmìnit jméno èi umístìní (n èi l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Tato funkce zatím nebyla implementována!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Zadejte jméno souboru, který mám vytvoøit: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Nalezeno chybné pøesmìrování \"//\"! Po¾adavek ignorován."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Zadejte nové jméno adresáøe: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Vytvoøit soubor èi adresáø? (f èi d):"
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, fuzzy, c-format
 msgid "Remove directory '%s'?"
 msgstr "Smazat soubor '%s'?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
 msgstr " adresáø"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Smazat soubor '%s'?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Smazat soubor?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Smazat symbolický odkaz '%s'?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Smazat symbolický odkaz?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Nevím jak nastavit pøístupová práva na ne-UNIXOVÉM systému souborù"
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Soubor s menu nastavení práv souborù nelze otevøít."
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Zadejte pøístupová práva:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Vlastník:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Skupina"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Ostatní:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "formuláø"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Chybný formát."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Chybná syntaxe."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Varování! UUdekódovaný soubor bude vytvoøen v adresáøi, ze kterého byl Lynx spu¹tìn."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "NULOVÝ URL ukazatel"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Spou¹tím %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Spou¹tí se systémový pøíkaz. Okam¾ik, prosím."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Aktuální adresáø:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Zvolené polo¾ky:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "®ádné polo¾ky nejsou zvoleny."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "oznaèena polo¾ka:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "oznaèené polo¾ky:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Chybné jméno souboru; po¾adavek ignorován."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Instalace do zvoleného adresáøe není povolena."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Zvolená polo¾ka není adresáøem! Po¾adavek ignorován."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Okam¾ik, prosím ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 #, fuzzy
 msgid "Error building install args"
 msgstr "Chyba pøi sestavování instalaèních argumentù."
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Zdroj je toto¾ný s cílem: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Cílový adresáø %s je toto¾ný s aktuálním."
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Instalace dokonèena"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "Doèasné URL nebo seznam by bylo pøíli¹ dlouhé."
 
@@ -4258,21 +4259,21 @@ msgstr "Tato zpráva byla vytvoøena automaticky programem"
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Winsock nenalezen. lituji."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 #, fuzzy
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "MUSÍTE zadat platný TMP èi TEMP prostor!\n"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 #, fuzzy
 msgid "No such directory"
 msgstr " adresáø"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4283,7 +4284,7 @@ msgstr ""
 "Konfiguraèní soubor %s je nedostupný.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4294,7 +4295,7 @@ msgstr ""
 "Znakové sady Lynxu nejsou deklarovány.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4305,7 +4306,7 @@ msgstr ""
 "Editovací mapy Lynxu nejsou deklarovány.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4316,73 +4317,73 @@ msgstr ""
 "Soubor %s není dostupný.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Varování:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Stav trvalých cookies bude zmìnìn a¾ pøi pøí¹tím sezení."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: Ignoruji neznámou znakovou sadu %s\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr ""
 "\n"
 "%s verze %s (%s)\n"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Pøelo¾en na %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Autorská práva patøí Kansaské univerzitì, CERN a ostatním autorùm.\n"
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Roz¹iøován podle podmínek Obecné veøejné licence GNU.\n"
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 #, fuzzy
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 "Podrobnìj¹í informace získáte na http://lynx.browser.org a z nápovìdy k programu.\n"
 "\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Pou¾ití: %s [pøepínaèe] [soubor]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Pøepínaèe:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Chybný pøepínaè %s\n"
@@ -4411,7 +4412,7 @@ msgstr "Nápovìda"
 msgid "System Index"
 msgstr "Systémový index"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Vstup na hlavní obrazovku"
 
@@ -4437,66 +4438,66 @@ msgstr ""
 msgid "failed to change directory"
 msgstr "Adresáø není dostupný."
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Znovu zpracovávám dokument za pou¾ití nových nastavení..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatální chyba - výstupní soubor %s nelze otevøít\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 #, fuzzy
 msgid "Current URL is empty."
 msgstr "Aktuální adresáø:"
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-rejstøík-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: startovní soubor nelze otevøít"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: startovní soubor nelze nalézt, nebo není ani typu text/html ani text/plain."
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Konèím..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-pokraèování-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Posíláte po¹tu na:"
 
@@ -4504,7 +4505,7 @@ msgstr "Posíláte po¹tu na:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4518,7 +4519,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4528,7 +4529,7 @@ msgstr ""
 "\n"
 "Zadejte pøedmìt zprávy\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4541,7 +4542,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4551,7 +4552,7 @@ msgstr ""
 "\n"
 "Zadejte text zprávy."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Zpráva neobsahuje ¾ádný pùvodní text!"
 
@@ -5222,38 +5223,38 @@ msgstr "Lynx: nelze spustit, soubor %s s pravidly CERN není dostupný\n"
 msgid "(no name)"
 msgstr "(¾ádné jméno)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Více ne¾ %d vnoøených vlo¾ení z lynx.cfg -- nejedná se o nekoneènou smyèku?!?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Poslední vlo¾ený soubor je '%s'.\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "vlo¾ený z '%s'.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Následující údaje jsou èteny z va¹eho lynx.cfg."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Pøeètìte si implicitní dodávaný s distribucí"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "pro více informací."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "NAÈÍST ZMÌNY"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Va¹e primární konfigurace"
 
@@ -5289,27 +5290,27 @@ msgstr "Polo¾ka, kterou jste právì zvolil"
 msgid "Full name:"
 msgstr "Celé jméno:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Odkaz nelze následovat"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Odkazuje do souboru:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Jméno vlastníka:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Jméno skupiny:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Velikost souboru:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 #, fuzzy
 msgid "(bytes)"
 msgstr "bajtù"
@@ -5317,163 +5318,163 @@ msgstr "bajtù"
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Datum vytvoøení:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Poslední zmìna:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Poslední pøístup:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Pøístupová práva "
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 #, fuzzy
 msgid "Group:"
 msgstr "Skupina"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Soubor, který si právì prohlí¾íte"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Jméno odkazu:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Znaková sada:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Poslední modifikace:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 #, fuzzy
 msgid "Expires:"
 msgstr "&nbsp;Expiruje:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Cache-Control:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Content-Length:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 #, fuzzy
 msgid "Length:"
 msgstr "Content-Length:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Jazyk:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "Post Data:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "Post Content Type:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Vlastníci:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "velikost:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "øádky"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "formuláøový re¾im"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "zdroj"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "bì¾ný"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", bezpeèný"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", pøes vnitøní odkaz"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", no-cache"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", ISMAP skript"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", soubor zálo¾ek"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "re¾im:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Odkaz, který jste právì zvolil"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Typ kódování"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 #, fuzzy
 msgid "Action:"
 msgstr "Umístìní: "
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Pole formuláøe)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Aktuální stránka neobsahuje ¾ádné odkazy"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 #, fuzzy
 msgid "Server Headers:"
 msgstr "Server:"
@@ -5527,34 +5528,34 @@ msgstr "Poslat na:"
 msgid "Upload options:"
 msgstr "Menu voleb posílání:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Neoèekávaný protokol pro tento typ URL."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 #, fuzzy
 msgid "unknown restriction"
 msgstr "®ádná omezení.\n"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "®ádná omezení.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Zapnutá omezení:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr ""
 
@@ -6199,6 +6200,9 @@ msgstr ""
 #~ msgid "History List maximum reached!  Document not pushed."
 #~ msgstr "Maximální velikost seznamu historie dosa¾ena! Dokument nebyl zaznamenán."
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "180 000 neúspì¹ných pokusù èíst ze soketu."
+
 #~ msgid "reason unknown."
 #~ msgstr "dùvod není znám."
 
diff --git a/po/da.po b/po/da.po
index f0dd6a0d..3209d3c0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.6-dev19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 2006-09-17 14:07+0200\n"
 "Last-Translator: Morten Bo Johansen <mojo@mbjnet.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -2161,7 +2161,7 @@ msgstr ""
 " Skriv venligst dit brev nedenfor."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2170,7 +2170,7 @@ msgstr ""
 " Når du er færdig, så tast <retur> og sæt et enkelt punktum (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2807,7 +2807,7 @@ msgstr "Dokument med 'POST'-indhold ikke fundet i cache. Genindsend?"
 msgid "Loading failed, use a previous copy."
 msgstr "Indlæsning slog fejl, brug en foregående kopi."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Indlæsning ikke fuldført."
 
@@ -2830,7 +2830,7 @@ msgstr "**** HTAccess: Statustilbagemelding var: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Kan ikke tilgå"
 
@@ -3034,7 +3034,7 @@ msgstr "Adresse har en ugyldig port"
 msgid "Address length looks invalid"
 msgstr "Adresselængde forekommer ugyldig"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ude af stand til at finde fremmed vært %s."
@@ -3043,40 +3043,41 @@ msgstr "Ude af stand til at finde fremmed vært %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ugyldigt værtsnavn %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Opretter %s-forbindelse til %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "sokkel fejlede."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, 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:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Kunne ikke oprette en ikke-blokerende forbindelse."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "Forbindelse opgivet (for mange forsøg)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Kunne ikke få sokkel til at blokere."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "Læsning af sokkel slog fejl i 180.000 forsøg."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Forbindelse opgivet (for mange forsøg)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3492,34 +3493,34 @@ msgstr "nøglegen-felt"
 msgid "unknown form field"
 msgstr "ukendt formularfelt"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "Kan ikke åbne fil til upload"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Indsender %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Program hænger: TextAnchor-struktur ødelagt - det er bedst at afbryde!"
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ombryd linjer så de passer til det viste område?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Meget lange linjer er blevet ombrudt!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "Meget lange linjer er blevet afkortet!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "bytes"
 
@@ -3694,7 +3695,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Fil kan måske genskabes fra %s under denne session"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Vil du udføre \"%s\"?"
@@ -3703,23 +3704,23 @@ msgstr "Vil du udføre \"%s\"?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Kan ikke få adgang til cgi-program"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Godt råd"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "En fortrinlig HTTP-server for VMS kan findes via"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "dette link"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Den tilbyder upåklagelig understøttelse af CGI-programmer\n"
 
@@ -3953,271 +3954,271 @@ msgstr "Henvisninger"
 msgid "Visible links"
 msgstr "Synlige links"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Kan ikke indhente status på '%s'."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Valgte enhed er ikke en fil eller et filkatalog!  Anmodning ignoreret."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Kan ikke %s pga. systemfejl!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Sandsynlig fejl for %s skyldes en systemfejl!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "slet %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr "opret %s"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "flyt %s til %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Der er allerede et filkatalog med dette navn! Anmodning ignoreret."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Der er allerede en fil med dette navn! Anmodning ignoreret."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Det anførte navn er allerede i brug! Anmodning ignoreret."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "Mål har en anden ejer! Nægtet."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Mål er ikke et gyldigt filkatalog! Nægtet."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Slet alle markerede filer og filkataloger?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Angiv en ny placering for de markerede filer: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Sti for lang"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Samme placering af kilde og mål - anmodning ignoreret!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Indtast nyt navn på filkatalog: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Indtast et nyt navn på fil: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Ugyldigt tegn (sti-separator) fundet! Anmodning ignoreret."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Anfør ny placering af filkatalog: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Anfør ny placering af fil: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Uventet fejl - kan ikke finde afsluttende sti-separator"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Samme placering af kilde og mål! Anmodning ignoreret!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Ret n=navn, l=placering eller p=rettighed: "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Ret n=navn eller l=placering: "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Denne programfunktion er endnu ikke indarbejdet!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Anfør navn på den fil som skal oprettes: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Ugyldig omdirigering \"//\" opdaget! Anmodning ignoreret."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Anfør navn på nyt filkatalog: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Opret f=fil eller d=filkatalog: "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Slet filkatalog '%s'?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
 msgstr "Slet filkatalog?"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Slet fil '%s'?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Slet fil?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Slet symbolsk link '%s'?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Slet symbolsk link"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Beklager, kun UNIX-filer kan gives rettigheder indtil videre."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Ude af stand til at åbne fil med rettighedstilvalg."
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Anfør rettigheder nedenfor:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Ejer:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Andre:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "formular som skal tillades"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Ugyldigt tilstandsformat."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Ugyldigt syntaksformat."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Advarsel!  UUDecodet fil lægges i filkatalog hvor du startede Lynx."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "NULL adressepeger"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Udfører %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Udfører systemkommando. Dette kan tage et øjeblik."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Aktuelle filkatalog:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Aktuelle udvalg:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Intet er aktuelt udvalgt."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "markeret enhed:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "markerede enheder:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Ugyldigt filnavn: anmodning ignoreret."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Installering i det valgte filkatalog er ikke tilladt."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Den markerede enhed er ikke et filkatalog! Anmodning ignoreret."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Vent et øjeblik, ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr "Kunne ikke danne installeringsparametre"
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Kilde og mål er det samme: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Står allerede i målkataloget: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Installering fuldført"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "Midlertidig adresse eller listen ville blive for lang."
 
@@ -4256,19 +4257,19 @@ msgstr "Denne meddelelse blev automatisk lavet af"
 msgid "No system mailer configured"
 msgstr "Systemets postprogram er ikke sat op"
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Ingen \"Winsock\" fundet, beklager."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Du SKAL definere et gyldigt TMP- eller TEMP-område!"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Intet sådant filkatalog"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4279,7 +4280,7 @@ msgstr ""
 "Opsætningsfil \"%s\" er ikke tilgængelig.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4290,7 +4291,7 @@ msgstr ""
 "Lynx' tegnsæt er ikke angivet.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4301,7 +4302,7 @@ msgstr ""
 "Lynx \"edit map\" er ikke angivet.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4312,68 +4313,68 @@ msgstr ""
 "Lynx-fil \"%s\" er ikke tilgængelig.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Ændring for varige cookier vil kun gælde næste session."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: Ignorerer ukendt tegnsæt=%s\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Version %s (%s)"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Bygget på %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Ophavsret indehaves af University of Kansas, CERN og andre bidragydere."
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Distribueret under GNU General Public License."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Se http://lynx.isc.org/ og online-hjælpen for flere oplysninger."
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "BRUG: %s [valgmuligheder] [fil]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Valgmuligheder er:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ugyldig indstilling: %s\n"
@@ -4402,7 +4403,7 @@ msgstr "Hjælpeskærm"
 msgid "System Index"
 msgstr "Systemfortegnelse"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Indgang til hovedskærm"
 
@@ -4426,65 +4427,65 @@ msgstr "En del af stien er ikke et filkatalog"
 msgid "failed to change directory"
 msgstr "kunne ikke skifte filkatalog."
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Genfortolker dokument under nuværende indstillinger ..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Kritisk fejl - kunne ikke åbne uddatafil %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr "TABEL-centrering slået til."
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr "TABEL-centrering slået fra."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "Aktuelle adresse er tom."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Kopiering til klippebord slog fejl."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "Dokumentets adresse overført til klippebord."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "Linkets adresse overført til klippebord."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "Ingen adresse ligger på klippebord."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-indeks-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Kan ikke få adgang til startfil"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: startfil fandtes ikke eller er ikke i text/html, text/plain format"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Afslutter ..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-mere-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Du vil sende til:"
 
@@ -4492,7 +4493,7 @@ msgstr "Du vil sende til:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4506,7 +4507,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4516,7 +4517,7 @@ msgstr ""
 "\n"
 " Indtast eller ret venligst emnelinjen\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4529,7 +4530,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4539,7 +4540,7 @@ msgstr ""
 "\n"
 " Skriv dit indlæg nedenfor."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Indlæg har ingen oprindelig tekst!"
 
@@ -5194,38 +5195,38 @@ msgstr "Lynx: Kan ikke starte op, CERN-regelfil %s findes ikke\n"
 msgid "(no name)"
 msgstr "(intet navn)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, 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åske en sløjfe!?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Sidste inkluderingsfil der forsøgtes indlæst var '%s',\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inkluderet fra '%s'.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Følgende er læst fra din lynx.cfg-fil."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Læs venligst distributionen"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "for flere kommentarer."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "GENINDLÆS ÆNDRINGERNE"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Din primære opsætning"
 
@@ -5261,186 +5262,186 @@ msgstr "Aktuelt valgte enhed"
 msgid "Full name:"
 msgstr "Fulde navn:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Ude af stand til at følge link"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Peger til fil:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Ejers navn:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Gruppes navn:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Filstr.:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr "(bytes)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Oprettelsesdato:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Sidst rettet:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Sidst tilgået:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Adgangsrettigheder"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr "Alle:"
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Oplysninger om det aktuelle dokument:"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Linknavn:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Tegnsæt:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr "(formodet)"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Dato:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Sidst ret:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr "Udløber:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Cachestyring:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "'Content-Length':"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr "Længde:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Sprog:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "POST-data:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "POST-indholdstype:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Ejer(e):"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "Str:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "linjer"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "formulartilstand"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "kilde"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", sikker"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", via internt link"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", no-cache"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", ISMAP-script"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", bogmærkefil"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "Tilstand:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Aktuelt valgte link"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Metode:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Kod.type:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr "Handling:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Formularfelt)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Ingen links på denne side"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr "Server-info:"
 
@@ -5493,33 +5494,33 @@ msgstr "Upload til:"
 msgid "Upload options:"
 msgstr "Valgmuligheder for uploads:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr "Hjemtag dokument fra adressen på klippebord."
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Uventet adgangsprotokol for denne adressetype."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "For mange midlertidige filer"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "ukendt begrænsning"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Ingen begrænsninger sat.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Begrænsninger sat:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "Kan ikke finde HOME-katalog"
 
@@ -6116,5 +6117,8 @@ msgstr ""
 #~ msgid "History List maximum reached!  Document not pushed."
 #~ msgstr "Antal linjer i historikliste udtømt! Dokument ikke skubbet ud."
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "Læsning af sokkel slog fejl i 180.000 forsøg."
+
 #~ msgid "reason unknown."
 #~ msgstr "ukendt årsag."
diff --git a/po/de.po b/po/de.po
index 9fd204ab..d248cb56 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.6-dev6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 2007-06-03 02:10+0200\n"
 "Last-Translator: Fabian Fingerle <fabian@datensalat.eu>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -2178,7 +2178,7 @@ msgstr ""
 " Bitte Nachricht unten eingeben."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2187,7 +2187,7 @@ msgstr ""
 " Wenn du fertig bist, Eingabetaste drücken und einen einzelnen Punkt (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2829,7 +2829,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:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Unvollständig geladen."
 
@@ -2852,7 +2852,7 @@ msgstr "**** HTAccess: Der empfangene Statuscode war %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Zugriff fehlgeschlagen:"
 
@@ -3059,7 +3059,7 @@ msgstr "Adresslänge hat einen ungültigen port"
 msgid "Address length looks invalid"
 msgstr "Adresslänge scheint ungültig zu sein"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Remote Host %s nicht gefunden."
@@ -3068,40 +3068,41 @@ 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:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Hostname ist ungültig: %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%s-Verbindung zu %s wird aufgebaut."
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "Socket-Fehler."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "Socketfehler: family %d addr %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Verbindung konnte nicht non-blocking gemacht werden."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "Verbindungsfehler (zu viele Versuche)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Socket konnte nicht wieder blocking gemacht werden."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "Lesefehler nach 180.000 Versuchen."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Verbindungsfehler (zu viele Versuche)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3516,34 +3517,34 @@ msgstr "\"Keygen\"-Feld"
 msgid "unknown form field"
 msgstr "unbekanntes Formfeld"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "Datei konnte nicht zum Upload geöffnet werden!"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "%s wird gesandt"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 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:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Zeilen umbrechen, um in den sichtbaren Bereich einzupassen?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Sehr lange Zeilen wurden umbrochen!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "Sehr lange Zeilen wurden abgeschnitten!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "bytes"
 
@@ -3719,7 +3720,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Datei kann möglicherweise während dieser Session mit %s wieder rekonstruiert werden"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3728,23 +3729,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Zugang zu CGI-Script nicht möglich"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Guter Rat"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Ein exzellenter HTTP-Server für VMS ist durch"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "diesen Link erhältlich"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Er hat state of the art CGI-Unterstützung.\n"
 
@@ -3983,271 +3984,271 @@ msgstr "Verweise"
 msgid "Visible links"
 msgstr "Sichtbare Links"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Status von '%s' nicht zugänglich."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Das Ausgewählte ist weder eine Datei noch ein Verzeichnis! Befehl ignoriert."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "%s unmöglich wegen eines Fehlers vom System!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "%s wahrscheinlich fehlgeschlagen, Fehler vom System!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "Löschen von %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr "\"Touchen\" von %s"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "Verschieben von %s nach %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Es gibt schon ein Verzeichnis mit demselben Namen! Befehl ignoriert."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Es gibt schon eine Datei mit demselben Namen! Befehl ignoriert."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Der angegebene Name ist schon in Benutzung! Befehl ignoriert."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "Ziel gehört jemand anderem! Befehl verweigert."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Ziel ist kein gültiges Verzeichnis! Befehl verweigert."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Alle markierten Dateien und Verzeichnisse löschen?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Neuer Ort für markierte Objekte: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Pfad zu lang"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Quelle und Ziel sind derselbe Ort - Befehl ignoriert!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Neuer Name für Verzeichnis: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Neuer Name für Datei: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Ungültiges Zeichen (path-separator) gefunden! Befehl ignoriert."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Neuer Ort für Verzeichnis: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Neuer Ort für Datei: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Unerwarteter Fehler - kann den Pfadsperator am Ende nicht finden"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Quelle und Ziel sind derselbe Ort! Befehl ignoriert!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Name(n), Ort(l) oder Zugriffsrechte(p) modifizieren? [nlp] "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Name(n) oder Ort(l) modifizieren? [nl] "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Noch nicht implementiert!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Name der Datei, die erzeugt werden soll: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Unerlaubte Umleitung \"//\" gefunden! Befehl ignoriert."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Name für neues Verzeichnis: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Datei(f) oder Verzeichnis(d) erzeugen? [fd] "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Verzeichnis '%s' entfernen? "
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
 msgstr "Verzeichnis entfernen?"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Datei '%s' entfernen? "
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Datei entfernen?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Symbolischen Link '%s' entfernen?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Symbolischen Link entfernen?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Sorry, Dateizugriffsrechte für Systeme außer UNIX können nicht geändert werden."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Zugriffsrechte-Optionsdatei kann nicht geöffnet werden"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Zugriffsrechte angeben:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Besitzer:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Andere:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "Form für Zugriffsrechte"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Ungültiges Format für mode."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Ungültiges Format für Syntax."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Warnung!  UUDekodierte Dateien werden im Startverzeichnis abgelegt."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "Null-URL-Zeiger"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Ausgeführt wird %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Systembefehl wird ausgeführt. Das kann eine Weile dauern."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Aktuelles Verzeichnis:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Aktuelle Auswahl:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Zurzeit nichts ausgewählt."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "Markiertes Objekt:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "Markierte Objekte:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Ungültiger Dateiname; Befehl ignoriert."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Installieren im ausgewählten Verzeichnis nicht gestattet."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Das ausgewählte Objekt ist kein Verzeichnis! Befehl ignoriert."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Nur ein Weilchen, ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr "Fehler beim Zusammenstellen der Installations-Argumente"
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Quelle und Ziel sind gleich: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Bereits im Zielverzeichis: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Installation fertig"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "Temporarärer URL oder Liste wäre zu lang."
 
@@ -4286,19 +4287,19 @@ msgstr "Diese Nachricht wurde automatisch generiert von"
 msgid "No system mailer configured"
 msgstr "Kein systemweiter Mailer konfiguriert"
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Kein Winsock gefunden, sorry."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Es muß ein gültiger Bereich für TMP oder TEMP definiert sein!"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Verzeichnis nicht vorhanden"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4309,7 +4310,7 @@ msgstr ""
 "Konfigurationsdatei %s ist nicht zugänglich.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4320,7 +4321,7 @@ msgstr ""
 "Lynx-Zeichensätze nicht deklariert.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4331,7 +4332,7 @@ msgstr ""
 "Lynx \"edit map\" nicht deklariert.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4342,71 +4343,71 @@ msgstr ""
 "Lynx-Datei %s ist nicht verfügbar.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Warnung:"
 
 # No idea what this means.  Seems highly experimental anyway. - kw
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 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:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignoriere unbekannte Codierung (charset)=%s\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Version %s (%s)"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Kompiliert auf %s, %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "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:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Verbreitet unter den Bedingungen der GNU General Public License."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 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:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "AUFRUF: %s [optionen] [datei oder URL]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Optionen sind:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ungültige Option: %s\n"
@@ -4435,7 +4436,7 @@ msgstr "Hilfe-Seite"
 msgid "System Index"
 msgstr "Systemindex"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Eingang zur Hauptseite"
 
@@ -4460,65 +4461,65 @@ msgid "failed to change directory"
 msgstr "Fehler beim Verzeichniswechsel"
 
 # How does one translate reparsing anyway? - kw
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Dokument wird mit jetzigen Einstellungen reinterpretiert..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fataler Fehler - Ausgabedatei %s konnte nicht geöffnet werden\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr "TABLE-Zentrierung aktivieren."
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr "TABLE-Zentrierung ausschalten."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "Aktueller URL ist leer."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Kopieren in das Clipboard fehlgeschlagen."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "URL des Dokuments in das Clipboard gespeichert."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "URL des Links in das Clipboard gespeichert."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "Kein URL in das Clipboard gespeichert."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-Index"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Unzugängliche Startdatei"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Startdatei nicht gefunden oder nicht text/html oder text/plain"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Ende..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-mehr-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Message wird hinterlegt werden in:"
 
@@ -4526,7 +4527,7 @@ msgstr "Message wird hinterlegt werden in:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4540,7 +4541,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4550,7 +4551,7 @@ msgstr ""
 "\n"
 " Bitte Betreff angeben oder ändern für den Subject-Header\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4563,7 +4564,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4573,7 +4574,7 @@ msgstr ""
 "\n"
 " Bitte Nachricht unten eingeben."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Die Message hat keinen neuen Text!"
 
@@ -5226,41 +5227,41 @@ msgstr "Lynx: Programmstart verweigert, Regeldatei %s (CERN rules file) nicht ve
 msgid "(no name)"
 msgstr "(ohne Namen)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, 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:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "letztes INCLUDE war für '%s',\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "enthalten in '%s'.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Folgendes ist der aktuellen Konfigurationsdatei entnommen."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Bitte die installierte Konfigurationsdatei"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 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:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "NEULADEN NACH ÄNDERUNG, AUF EIGENE GEFAHR!"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Ihre primäre Konfiguration"
 
@@ -5296,189 +5297,189 @@ msgstr "Zurzeit ausgewähltes Objekt"
 msgid "Full name:"
 msgstr "  Pfadname:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Kann dem Link nicht folgen"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "      Zeigt auf:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Name des Besitzers:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Gruppenname:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Dateilänge:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr "(Bytes)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Erzeugungsdatum:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Letzte Änderung:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Letzter Zugriff:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Zugriffsrechte"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr "Welt:"
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Zurzeit angeschautes Dokument"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Linkname:"
 
 # Some of the following stuff is highly technical, so leave as English
 # (or whatever the language of protocol elements is...) - kw
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Charset:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr "(vermutet)"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Geändert:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr "Expires:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Cache-Control:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Content-Length:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 #, fuzzy
 msgid "Length:"
 msgstr "Content-Length:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Language:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "POST-Daten:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "POST-Content-Type:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Besitzer:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "Länge:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "Zeilen"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "Formmodus"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "Quelltext"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", sicher"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", durch internen Link"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", no-cache"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", ISMAP-Script"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", Lesezeichendatei"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "Modus:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Zurzeit ausgewählter Link"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr "Aktion:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Formfeld)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Keine Links auf dieser Seite"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr "Server-Headers:"
 
@@ -5531,33 +5532,33 @@ msgstr "Upload - wohin:"
 msgid "Upload options:"
 msgstr "Upload-Optionen:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr "URL des Download-Dokuments in das Clipboard gespeichert."
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Unerwartetes Zugangsprotokoll für dieses URL-Schema."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "Zu viele temporäre Dateien"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "unbekannte Beschränkung"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Keine Beschränkungen gesetzt.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Aktuelle Beschränkungen:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "Das HOME-Verzeichnis ist nicht zu finden"
 
@@ -6186,6 +6187,9 @@ msgstr ""
 "hier am falschen Ort.  Die generelle Konfigurationsdatei wird üblicherweise\n"
 "lynx.cfg genannt, und ihr Inhalt und Format ist verschieden.\n"
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "Lesefehler nach 180.000 Versuchen."
+
 #~ msgid "History List maximum reached!  Document not pushed."
 #~ msgstr "Maximum für History-Liste erreicht! Dokument nicht auf Stapel abgelegt."
 
diff --git a/po/et.po b/po/et.po
index 2c525bb1..d6b2045f 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.6-dev19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 2006-10-26 14:26+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -2158,7 +2158,7 @@ msgstr ""
 " Palun sisestage all oma teade."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2167,7 +2167,7 @@ msgstr ""
 "Kui te olete valmis, vajutage enter ja kirjutage punkt (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2804,7 +2804,7 @@ msgstr "POST sisuga dokument puudub puhvrist. Postitan uuesti?"
 msgid "Loading failed, use a previous copy."
 msgstr "laadimine ebaõnnestus, kasuta eelmist koopiat."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Mittetäielik laadimine."
 
@@ -2827,7 +2827,7 @@ msgstr "**** HTAccess: Tagastatud olek oli: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Ei saa kasutada"
 
@@ -3032,7 +3032,7 @@ msgstr "Aadressis on vigane port"
 msgid "Address length looks invalid"
 msgstr "Aadressi pikkus tundub vigane"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ei leia serverit %s."
@@ -3041,40 +3041,41 @@ msgstr "Ei leia serverit %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Vigane serveri nimi %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Loon %s ühendust serveriga %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "socket ebaõnnestus."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "socket ebaõnnestus: perekond %d aadress %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Ei õnnestu muuta ühendust mitte-blokeerivaks."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "Ühendus ebaõnnestus (looga palju katseid)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Pistikul ei õnnestu taastada blokeerivat moodi."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "Pistikust lugemine ebaõnnestus 180 000 katsel."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Ühendus ebaõnnestus (looga palju katseid)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3489,34 +3490,34 @@ msgstr "võtme loomise väli"
 msgid "unknown form field"
 msgstr "tundmatu vormi väli"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "Faili ei õnnestu üleslaadimiseks avada"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Postitan %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 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:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Murran read et mahtuda ekraanile?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Väga pikad read on murtud!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "Väga pikad read on lõigatud!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "baiti"
 
@@ -3690,7 +3691,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Fail võib selle sessiooni jooksul olla taastatav failist %s"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Kas soovite \"%s\" käivitada?"
@@ -3699,23 +3700,23 @@ msgstr "Kas soovite \"%s\" käivitada?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Cgi skripti ei saa kasutada"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Hea soovitus"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Suurepärane http server VMS süsteemile on saadav"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "sellelt viitelt"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "See pakub korralikku CGI skriptide tuge.\n"
 
@@ -3947,271 +3948,271 @@ msgstr "Viited"
 msgid "Visible links"
 msgstr "Nähtavad viited"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Ei õnnestu lugeda '%s' olekut."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Valik ei ole fail ega kataloog! Ignoreerin päringut."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Süsteemi vea tõttu ei õnnestu %s!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Ilmselt %s viga süsteemi vea tõttu!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "eemalda %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr "puuduta %s"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "tõstan %s -> %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Sellise nimega kataloog on juba olemas! Ignoreerin päringut."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Sellise nimega fail on juba olemas! Ignoreerin päringut."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Antud nimi on juba kasutusel! Ignoreerin päringut."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "Sihtkohal on teine omanik! Keeldun päringut täitmast."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Sihtkoht ei ole lubatud kataloog! Keeldun päringut täitmast."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Eemaldan kõik märgitud failid ja kataloogid?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Sisestage valitud elementidele uus asukoht: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Tee on liiga pikk"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Allikas ja sihtkoht on samad - ignoreerin päringut!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Sisestage kataloogi uus nimi: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Sisestage faili uus nimi: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Leiti lubamatu sümbol (tee eraldaja)! Päringut ignoreeritakse."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Sisestage kataloogi uus asukoht: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Sisestage faili uus asukoht: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Ootamatu tõrge - ei leia lõpust tee eraldajat"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Allikas ja sihtkoht on samad! Ignoreerin päringut!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Muuda nime, asukohta või õiguseid (n, l või p): "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Muuda nime või asukohta (n või l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Seda omadust ei ole veel realiseeritud!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Sisestage loodavale failile nimi: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Leiti vigane ümbersuunamine \"//\"! Ignoreerin päringut."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Sisestage nimi uuele kataloogile: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Luua fail või kataloog (f või d): "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Kustutan kataloogi '%s'?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
 msgstr "Kustutan kataloogi?"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Eemaldan faili '%s'?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Eemaldan faili?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Eemaldan nimeviite '%s'?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Eemaldan nimeviite?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Vabandust, ma ei tea veel, kuidas sedada mitte-UNIX failide õiguseid."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Õiguste seadete faili avamine ebaõnnestus"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Määrake õigused allpool:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Omanik:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Grupp:"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Ülejäänud:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "vorm seadmaks õiguseid"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Vigane moodi formaat."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Vigane süntaksi formaat."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Hoiatus! UUdekodeeritud fail luuakse kataloogi, kus Lynx käivitati."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "NULL URL viit"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Täidan %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Täidan süsteemse käsu. See võib kesta mõne aja."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Jooksev kataloog:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Praegune valik:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Midagi ei ole valitud."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "märgitud element:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "märgitud elemendid:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Vigane failinimi; ignoreerin päringut."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Valitud kataloogi ei ole lubatud installeerida."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Valik ei ole kataloog! Ignoreerin päringut."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Üks hetk, ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr "Viga installi argumentide koostamisel"
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Lähte ja sihtkoht on samad: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "On juba sihtkataloogis: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Installeerimine on valmis"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "Ajutine URL või loend oleks liiga pikk."
 
@@ -4250,19 +4251,19 @@ msgstr "See teade on automaatselt loodud"
 msgid "No system mailer configured"
 msgstr "Süsteemset e-posti programmi ei ole seadistatud"
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Winsock puudub, kahju."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Te PEATE defineerima kehtiva TMP või TEMP piirkonna!"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Sellist kataloogi ei ole"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4273,7 +4274,7 @@ msgstr ""
 "Seadete faili \"%s\" ei ole.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4284,7 +4285,7 @@ msgstr ""
 "Lynx kooditabeleid ei ole deklareeritud.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4295,7 +4296,7 @@ msgstr ""
 "Lynx kaadri toimeti ei ole deklareeritud.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4306,68 +4307,68 @@ msgstr ""
 "Lynx fail \"%s\" ei ole kasutatav.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Hoiatus:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "püsivate präänikute olekut muudetakse alles järgmise sessiooniga."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignoreerin tundmatut kooditabelit %s\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versioon %s (%s)"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Ehitatud %s masinal %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Autoriõiguseid omavad University of Kansas, CERN ja teised."
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Levitatakse GNU üldise avaliku litsensiga."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 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:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "KASUTAMINE: %s [võtmed] [fail]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Võtmed on:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Vigane võti: %s\n"
@@ -4396,7 +4397,7 @@ msgstr "Abiinfo ekraan"
 msgid "System Index"
 msgstr "Süsteemi indeks"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Sisenemine põhiekraanile"
 
@@ -4420,65 +4421,65 @@ msgstr "Tee komponent ei ole kataloog"
 msgid "failed to change directory"
 msgstr "kataloogi ei õnnestu vahetada"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Parsin dokumendi uuesti jooksvate seadetega..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fataalne viga - ei õnnestu avada väljundfaili %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr "TABELI tsentreerimine lubatud."
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr "TABELI tsentreerimine blokeeritud."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "Jooksev URL on tühi."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Lõikepuhvrisse kopeerimine ebaõnnestus."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "Panin dokumendi URLi lõikepuhvrisse."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "Panin viite URLi lõikepuhvrisse."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "Lõikepuhvris URLe ei ole."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-indeks-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Ei õnnestu laadida esilehte"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Esilehte pole või ei ole text/html ega text/plain tüüpi"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Lõpetan..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-veel-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Te postitate gruppi:"
 
@@ -4486,7 +4487,7 @@ msgstr "Te postitate gruppi:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4500,7 +4501,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4510,7 +4511,7 @@ msgstr ""
 "\n"
 " Palun lisage või muutke teema Subject: päises\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4523,7 +4524,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4533,7 +4534,7 @@ msgstr ""
 "\n"
 " Palun sisestage oma teade."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Teatel puudub algne tekst!"
 
@@ -5186,38 +5187,38 @@ msgstr "Lynx: ei saa startida, CERN reeglite fail %s ei ole kasutatav\n"
 msgid "(no name)"
 msgstr "(nimetu)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, 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 tsükkel?!?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Viimane kaasata üritatud fail oli '%s',\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "kaasatud failist '%s'.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Järgnev on loetud teie lynx.cfg failist."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Lisainfo jaoks lugege palun"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "paketis olevat faili."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "MUUTUSTE LAADIMINE"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Teie primaarsed seaded"
 
@@ -5253,186 +5254,186 @@ msgstr "Praegu valitud element"
 msgid "Full name:"
 msgstr "Täisnimi"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Viidet ei õnnestu järgida"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Osutab failile: "
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Omaniku nimi"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Grupi nimi"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Faili suurus"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr "(baiti)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Loodud:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Viimati muudetud:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Viimane kasutamine:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Kasutamise õigused"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr "Grupp:"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr "Ülejäänud:"
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Fail mida te parajasti vaatate"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Viite nimi:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Kooditabel:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr "(eeldatatkse)"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Kuupäev:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Viimane muutmine:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr "Aegub:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Vahemälu-kontroll:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Sisu-pikkus:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr "Pikkus:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Keel:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "Post andmed:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "Post sisu tüüp:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Omanik(ud):"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "maht:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "ridu"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "vormide mood"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "lähtetekst"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normaalne"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", turvaline"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", sisemise viitega"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", mitte-puhverdatav"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", ISMAP skript"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", järgede fail"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "mood:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Praegu valitud viide"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Meetod:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Kodeering:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr "Tegevus: "
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Vormi väli)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Jooksval lehel ei ole viiteid"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr "Serveri päised:"
 
@@ -5485,33 +5486,33 @@ msgstr "Lae üles:"
 msgid "Upload options:"
 msgstr "Üleslaadimise seaded:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr "Panin dokumendi allalaadimise URLi lõikepuhvrisse."
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Selle URL skeemiga kasutatakse ootamatut kasutamise protokolli."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "Liiga palju ajutisi faile"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "tundmatu piirang"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Piiranguid pole.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Seatud piirangud:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "Ei leie HOME kataloogi"
 
@@ -6088,5 +6089,8 @@ msgstr ""
 #~ msgid "History List maximum reached!  Document not pushed."
 #~ msgstr "Ajaloo loendi maksimum saavutatud! Dokumenti ei lisata."
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "Pistikust lugemine ebaõnnestus 180 000 katsel."
+
 #~ msgid "reason unknown."
 #~ msgstr "põhjus tundmatu."
diff --git a/po/fr.po b/po/fr.po
index 9db9edea..84e9065e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,26 +1,31 @@
 # Lynx French translation text messages
-# Copyright (C) 1999 James E. Spath
+# Copyright (C) 2008 Free Software Foundation, Inc.
+# This file is distributed under the same license as the lynx package.
 # You may freely copy this file and add messages and translations
 # as long no comments are removed.
 # FIRST AUTHOR:
 # * * * * * * * * * *
-# The French translations for Lynx were created by the 
+# The French translations for Lynx were created by the
 # Chebucto Project.
 # Contributors include:
 # Chris Maxwell (CM)
 # David Potter
 # David Trueman (NdT)
 # * * * * * * * * * *
-# J.E. Spath <jspath @ bcpl . net> wedged this into Lynx
+#
+# relecture complète 09/2008 N. Provost
+#
 # started: Wed Sep  2 20:22:45 EDT 1998
-# * * * * * * * * * *
+# J.E. Spath <jspath@bcpl.net> wedged this into Lynx, 1999.
+# Nicolas Provost <nprovost@quadriv.com>, 2008.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.2\n"
+"Project-Id-Version: lynx 2.8.7-dev9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
-"PO-Revision-Date: 1999-06-05 15:18-0400\n"
-"Last-Translator: Jim Spath <jspath@bcpl.net>\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
+"PO-Revision-Date: 2008-09-26 12:01+0100\n"
+"Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -58,7 +63,7 @@ msgstr "Bienvenue"
 
 #: LYMessages.c:34
 msgid "Are you sure you want to quit?"
-msgstr "Désirez-vous vraiment quitter?"
+msgstr "Désirez-vous vraiment quitter ?"
 
 #: LYMessages.c:36
 msgid "Really exit from Lynx?"
@@ -70,11 +75,11 @@ msgstr "Connexion interrompue."
 
 #: LYMessages.c:39
 msgid "Data transfer interrupted."
-msgstr "Transfert de données interrompu"
+msgstr "Transfert de données interrompu."
 
 #: LYMessages.c:40
 msgid "Cancelled!!!"
-msgstr "Annulé!"
+msgstr "Annulé !"
 
 #: LYMessages.c:41
 msgid "Cancelling!"
@@ -82,7 +87,7 @@ msgstr "Annulation!"
 
 #: LYMessages.c:42
 msgid "Excellent!!!"
-msgstr "Excellent!"
+msgstr "Excellent !"
 
 #: LYMessages.c:43
 msgid "OK"
@@ -90,11 +95,11 @@ msgstr "OK"
 
 #: LYMessages.c:44
 msgid "Done!"
-msgstr "Terminé!"
+msgstr "Terminé !"
 
 #: LYMessages.c:45
 msgid "Bad request!"
-msgstr "Demande erronée!"
+msgstr "Demande erronée !"
 
 #: LYMessages.c:46
 msgid "previous"
@@ -106,7 +111,7 @@ msgstr "écran suivant"
 
 #: LYMessages.c:48
 msgid "HELP!"
-msgstr "Aide!"
+msgstr "Aide !"
 
 #: LYMessages.c:49
 msgid ", help on "
@@ -115,16 +120,16 @@ msgstr ", aide activée "
 #. #define HELP
 #: LYMessages.c:51
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
-msgstr "Touches fléchées: se déplacer, '?': aide, 'q': quitter, '<-': retour"
+msgstr "Commandes : flèches=se déplacer, '?'=aide, 'q'=quitter, '<--'=retour"
 
 #. #define MOREHELP
 #: LYMessages.c:53
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
-msgstr "touche d'espace.: page suiv., flèches: se déplacer, '?': aide, 'q': quitter"
+msgstr "appui sur 'espace'=page suiv., flèches=se déplacer, '?'=aide, 'q'=quitter"
 
 #: LYMessages.c:54
 msgid "-- press space for next page --"
-msgstr "- appuyez sur la touche d'espacement pour aller à la page suivante -"
+msgstr "- appuyez sur la barre d'espace pour aller à la page suivante -"
 
 #: LYMessages.c:55
 msgid "URL too long"
@@ -150,120 +155,120 @@ msgstr "(Zone de texte) Inactive. Appuyez sur <entrée> pour l'activer (%s pour é
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
 #: LYMessages.c:67
 msgid "(Form field) Inactive.  Use <return> to edit."
-msgstr "Entrez le texte. <Entr> pour confirmer («x» : nouvelle instance)."
+msgstr "(Champ formulaire) inactif. <Entrée> pour éditer."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
 #: LYMessages.c:69
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
-msgstr "Entrez le texte. <Entr> pour confirmer (%s : nouvelle instance)."
+msgstr "(Champ formulaire) inactif. <Entrée> pour éditer (%s soumettre sans cache)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
 #: LYMessages.c:71
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
-msgstr "Entrez le texte. <Entr> pour confirmer; flèches ou tabulateur pour se déplacer."
+msgstr "(Champ formulaire) inactif. <Entrée> pour éditer, deux fois pour soumettre."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
 #: LYMessages.c:73
 msgid "(mailto form field) Inactive.  Press <return> to change."
-msgstr "Entrez le texte. <Entr> pour confirmer; touches fléchées pour vous déplacer."
+msgstr "(Champ mailto) inactif. <Entrée> pour modifier."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
 #: LYMessages.c:75
 msgid "(Password entry field) Inactive.  Press <return> to activate."
-msgstr "Entrez le texte. Touches HAUT/BAS ou tabulateur pour vous déplacer."
+msgstr "(Champ mot de passe) inactif. <Entrée> pour activer."
 
 #. #define FORM_LINK_FILE_UNM_MSG
 #: LYMessages.c:78
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
-msgstr "Utilisez les touches HAUT/BAS ou le tabulateur pour vous déplacer."
+msgstr "Champ fichier non modifiable. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_FILE_MESSAGE
 #: LYMessages.c:80
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
-msgstr "Entrez le texte. Touches HAUT/BAS ou tabulateur pour se déplacer."
+msgstr "Entrez le nom de fichier. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_TEXT_MESSAGE
 #: LYMessages.c:82
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "Entrez le texte. Touches HAUT/BAS ou tabulateur pour se déplacer"
+msgstr "Entrez le texte. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
 #: LYMessages.c:84
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
-msgstr "Entrez le texte. Touches HAUT/BAS ou tabulateur pour se déplacer."
+msgstr "(Zone texte) Entrez le texte. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
 #: LYMessages.c:86
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
-msgstr "Entrez le texte. Touches HAUT/BAS ou tabulateur pour se déplacer (%s pour éditeur)"
+msgstr "(Zone de texte) Entrez le texte. Déplacez-vous avec <haut>,<bas>,<tab> (%s pour éditeur)"
 
 #. #define FORM_LINK_TEXT_UNM_MSG
 #: LYMessages.c:88
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
-msgstr "Utilisez les touches HAUT/BAS ou le tabulateur pour vous déplacer."
+msgstr "Champ texte non modifiable. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
 #: LYMessages.c:90
 msgid "(Form field) Enter text.  Use <return> to submit."
-msgstr "Entrez le texte. <Entr> pour confirmer."
+msgstr "(Champ formulaire) Entrez le texte. <Entrée> pour soumettre."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
 #: LYMessages.c:92
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
-msgstr "Entrez le texte. <Entr> pour confirmer (%s : nouvelle instance)."
+msgstr "(Champ formulaire) Entrez le texte. <Entrée> pour confirmer (%s : nouvelle instance)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
 #: LYMessages.c:94
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
-msgstr "Entrez le texte. <Entr> pour confirmer; flèches ou tabulateur pour se déplacer"
+msgstr "(Champ formulaire) Entrez le texte. <Entrée> pour confirmer; <flèches>,<tab> pour se déplacer."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
 #: LYMessages.c:96
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
-msgstr "Utilisez les touches HAUT/BAS ou le tabulateur pour vous déplacer"
+msgstr "Champ formulaire non modifiable. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
 #: LYMessages.c:98
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
-msgstr "Entrez le texte. <Entr> pour confirmer; touches fléchées pour vous déplacer"
+msgstr "(Champ mailto) Entrez le texte. <Entrée> pour confirmer, <flèches> pour vous déplacer."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
 #: LYMessages.c:100
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
-msgstr "Fonction de courrier invalidée; impossible de soumettre l'envoi"
+msgstr "(champ mailto) Fonction de courrier invalidée; impossible de soumettre l'envoi."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
 #: LYMessages.c:102
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "Entrez le texte. Touches HAUT/BAS ou tabulateur pour vous déplacer"
+msgstr "Entrez le mot de passe. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
 #: LYMessages.c:104
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
-msgstr "Utilisez les touches HAUT/BAS ou le tabulateur pour vous déplacer"
+msgstr "Champ mot de passe non modifiable. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
 #: LYMessages.c:106
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
-msgstr "Touche DROITE ou <Entr> pour changer d'option"
+msgstr "(Case à cocher) Touche <droite> ou <Entrée> pour changer d'option."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
 #: LYMessages.c:108
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
-msgstr "Utilisez les touches HAUT/BAS ou le tabulateur pour vous déplacer"
+msgstr "Case à cocher non modifiable. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_RADIO_MESSAGE
 #: LYMessages.c:110
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
-msgstr "Touche DROITE ou <Entr> pour changer d'option"
+msgstr "(Bouton radio) Touche <droite> ou <Entrée> pour changer d'option."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
 #: LYMessages.c:112
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
-msgstr "Utilisez les touches HAUT/BAS ou le tabulateur pour vous déplacer"
+msgstr "Bouton radio non modifiable. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
 #: LYMessages.c:114
@@ -278,17 +283,17 @@ msgstr "Soumettre à"
 #. #define FORM_LINK_SUBMIT_MESSAGE
 #: LYMessages.c:118
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
-msgstr "Touche DROITE ou <Entr> pour confirmer («x» : nouvelle instance)"
+msgstr "(Bouton d'envoi) Touche <droite> ou <Entrée> pour envoyer ('x' : nouvelle instance)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
 #: LYMessages.c:120
 msgid "(Form submit button) Use right-arrow or <return> to submit."
-msgstr "Utilisez la touche DROITE ou <Entr> pour confirmer"
+msgstr "(Bouton d'envoi) Utilisez la touche <droite> ou <Entrée> pour confirmer."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
 #: LYMessages.c:122
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
-msgstr "Utilisez les touches HAUT/BAS ou le tabulateur pour vous déplacer"
+msgstr "Bouton d'envoi désactivé. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
 #: LYMessages.c:124
@@ -298,43 +303,43 @@ msgstr "Soumettre le formulaire via mail à"
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
 #: LYMessages.c:126
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
-msgstr "Utilisez la touche DROITE ou <Entr> pour confirmer"
+msgstr "(bouton de soumission mail) Utilisez la touche <droite> ou <Entrée> pour confirmer."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
 #: LYMessages.c:128
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
-msgstr "Fonction de courrier invalidée; envoi impossible"
+msgstr "(bouton soumission mail) Fonction de courrier invalidée; envoi impossible"
 
 #. #define FORM_LINK_RESET_MESSAGE
 #: LYMessages.c:130
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
-msgstr "Utilisez la touche DROITE ou <Entr> pour réinitialiser le formulaire"
+msgstr "(Bouton de raz formulaire) Pressez <droite> ou <Entrée> pour réinitialiser le formulaire."
 
 #. #define FORM_LINK_RESET_DIS_MSG
 #: LYMessages.c:132
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
-msgstr "Utilisez les touches HAUT/BAS ou le tabulateur pour vous déplacer"
+msgstr "Bouton de raz formulaire désactivé. Déplacez-vous avec <haut>,<bas>,<tab>."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
 #: LYMessages.c:134
 msgid "(Option list) Hit return and use arrow keys and return to select option."
-msgstr "Faites <Entr> et touches fléchées, puis <Entr> pour choisir une option"
+msgstr "(Liste d'options) Pressez <Entrée> puis les <flèches> ; <Entrée> pour choisir une option."
 
 # /maxwell/lynx2.7.1/LYMessages_en.h
 #. #define CHOICE_LIST_MESSAGE
 #: LYMessages.c:136
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
-msgstr "(Liste de choix) Entr, puis touches fléchées et Entr pour faire votre choix"
+msgstr "(Liste de choix) <Entrée>, puis <flèches> ; <Entrée> pour faire votre choix."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
 #: LYMessages.c:138
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
-msgstr "Faites <Entr> ou touches fléchées pour revoir les options et quitter"
+msgstr "Liste d'options non modifiable. Pressez <Entrée> ou <flèches> pour revoir les options ou quitter."
 
 #. #define CHOICE_LIST_UNM_MSG
 #: LYMessages.c:140
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
-msgstr "Liste de choix NON MODIFIABLE. Entr ou touches fléchées pour revoir ou quitter"
+msgstr "Liste de choix non modifiable. Pressez <Entrée> ou <flèches> pour revoir ou quitter."
 
 #: LYMessages.c:141
 msgid "Submitting form..."
@@ -347,17 +352,17 @@ msgstr "Réinitialisation du formulaire..."
 #. #define RELOADING_FORM
 #: LYMessages.c:144
 msgid "Reloading document.  Any form entries will be lost!"
-msgstr "Rechargement du document.  Toutes les entrées seront effacées!"
+msgstr "Rechargement du document.  Toutes les entrées seront effacées !"
 
 #: LYMessages.c:145
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
-msgstr "Transcodage impossible des données au jeu de caractères %s!"
+msgstr "Impossible de coder les données du formulaire dans le jeu de caractères %s !"
 
 #. #define NORMAL_LINK_MESSAGE
 #: LYMessages.c:148
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
-msgstr "Utilisez la touche DROITE ou <Entr> pour activer le lien"
+msgstr "(Lien normal) Pressez <droite> ou <Entrée> pour activer le lien."
 
 #: LYMessages.c:149
 msgid "The resource requested is not available at this time."
@@ -389,7 +394,7 @@ msgstr "Utilisation de %s"
 #: LYMessages.c:155
 #, c-format
 msgid "Illegal URL: %s"
-msgstr "URL illégal : %s"
+msgstr "URL illégale : %s"
 
 #: LYMessages.c:156
 #, c-format
@@ -399,11 +404,11 @@ msgstr "Adresse mal formée %s"
 #: LYMessages.c:157
 #, c-format
 msgid "URL: %s"
-msgstr "l'URL : %s"
+msgstr "URL : %s"
 
 #: LYMessages.c:158
 msgid "Unable to access WWW file!!!"
-msgstr "Impossible d'accéder au fichier W3!"
+msgstr "Impossible d'accéder au fichier WWW !"
 
 #: LYMessages.c:159
 #, c-format
@@ -418,88 +423,88 @@ msgstr "-Suite- Ceci est un index consultable. Utilisez %s pour la recherche."
 
 #: LYMessages.c:162
 msgid "You have entered an invalid link number."
-msgstr "Vous avez entré un numéro de lien invalide."
+msgstr "Vous avez saisi un numéro de lien non valide."
 
 #. #define SOURCE_HELP
 #: LYMessages.c:164
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
-msgstr "Vous visualisez le code source. Faites '\\' pour la version hypertexte"
+msgstr "Vous visualisez le code source. Faites '\\' pour la version hypertexte."
 
 #. #define NOVICE_LINE_ONE
 #: LYMessages.c:166
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
-msgstr "HAUT/BAS: se déplacer; DROITE: activer le lien; GAUCHE: document précédent\n"
+msgstr "<haut>/<bas>=se déplacer, <droite>=activer le lien, <gauche>=document précédent.\n"
 
-# Is the AIDE command correct? There is no online Help in Lynx. 
+# Is the AIDE command correct? There is no online Help in Lynx.
 #. #define NOVICE_LINE_TWO
 #: LYMessages.c:168
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
-msgstr "H) Accueil S) Paramètres P) Imprimer G) Aller M) Départ Q)uitter /=chercher [Y]=Historique\n"
+msgstr "H)Aide  O)ptions  P)Imprimer G)Aller à  M)écran pal Q)uitter </>=chercher <retour>=Histor.\n"
 
 #. #define NOVICE_LINE_TWO_A
 #: LYMessages.c:170
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
-msgstr " O) Commandes G) Aller B) PagePréc H) Accueil C)ommenter ^L) Rafraîchir Q)uitter\n"
+msgstr "  O)Autres comm.  H)Aide  K)Clavier G)Aller à  P)Imprimer  M)Ecran pal  o)ptions Q)uitter\n"
 
 #. #define NOVICE_LINE_TWO_B
 #: LYMessages.c:172
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
-msgstr "  O) Commandes S) Paramètres W) Recherche N) Suivant D) Décharger U) Charger\n"
+msgstr "  O)Autres comm.  B)retour  E)diter  D)Télécharger ^R)echarger ^W)nettoyer écran </> chercher doc\n"
 
 # NOVICE_LINE_TWO_C
 #. #define NOVICE_LINE_TWO_C
 #: LYMessages.c:174
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
-msgstr "O) Commandes  K) Clavier  ^R) Recharger  Signets: v)oir A)jouter R) Suppr\n"
+msgstr "O)Autres comm.  C)ommentaires  <retour>=historique | Signets : V)oir, A)jouter, R)supprimer\n"
 
 #  Z)ap Transfer missing from line, since it does nothing
 #. #define FORM_NOVICELINE_ONE
 #: LYMessages.c:176
 msgid "            Enter text into the field by typing on the keyboard              "
-msgstr "Entrez le texte dans la zone à partir du clavier                 "
+msgstr "            Entrez le texte dans la zone à partir du clavier                 "
 
 #. #define FORM_NOVICELINE_TWO
 #: LYMessages.c:178
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
-msgstr "Ctrl-U pour supprimer tout le texte, [rapp. arrière] pour effacer caractère"
+msgstr "    <Ctrl-U> pour supprimer tout le texte, <retour arr> pour effacer caractère"
 
 #. #define FORM_NOVICELINE_TWO_DELBL
 #: LYMessages.c:180
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
-msgstr "Ctrl-U pour supprimer tout le texte, [rapp. arrière] pour effacer caractère"
+msgstr "      <Ctrl-U> pour supprimer tout le texte, <retour arr> pour effacer caractère"
 
 #. #define FORM_NOVICELINE_TWO_VAR
 #: LYMessages.c:182
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
-msgstr "%s pour supprimer tout le texte, [rapp. arrière] pour effacer caractère"
+msgstr "    %s pour effacer tout le texte, <retour arr> pour effacer caractère"
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
 #: LYMessages.c:184
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
-msgstr "%s pour supprimer tout le texte, [rapp. arrière] pour effacer caractère"
+msgstr "      %s pour effacer tout le texte, <retour arr> pour effacer caractère"
 
 #. mailto
 #: LYMessages.c:187
 msgid "Malformed mailto form submission!  Cancelled!"
-msgstr "Envoi de formulaire mailto incorrect. Demande annulée!"
+msgstr "Envoi de formulaire mailto incorrect. Annulé !"
 
 #: LYMessages.c:188
 msgid "Warning!  Control codes in mail address replaced by ?"
-msgstr "Attention! Les codes de contrôles de l'adresse ont étés remplacés par ?"
+msgstr "Attention ! Les codes de contrôles de l'adresse mail ont été remplacés par ?"
 
 #: LYMessages.c:189
 msgid "Mail disallowed!  Cannot submit."
-msgstr "La fonction de courrier est invalidée. Impossible de soumettre l'envoi!"
+msgstr "Envoi de courrier interdit. Impossible de soumettre l'envoi !"
 
 #: LYMessages.c:190
 msgid "Mailto form submission failed!"
-msgstr "Impossible d'envoyer le formulaire mailto!"
+msgstr "Impossible d'envoyer le formulaire par mail !"
 
 #: LYMessages.c:191
 msgid "Mailto form submission Cancelled!!!"
-msgstr "Envoi du formulaire mailto annulé!"
+msgstr "Envoi du formulaire par mail annulé !"
 
 #: LYMessages.c:192
 msgid "Sending form content..."
@@ -507,40 +512,40 @@ msgstr "Envoi du contenu du formulaire..."
 
 #: LYMessages.c:193
 msgid "No email address is present in mailto URL!"
-msgstr "Aucune adresse de courrier ne figure dans l'URL mailto!"
+msgstr "Aucune adresse de courriel ne figure dans l'URL d'envoi !"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
 #: LYMessages.c:195
 msgid "Unable to open temporary file for mailto URL!"
-msgstr "Impossible d'ouvrir de fichier temporaire pour l'URL mailto!"
+msgstr "Impossible d'ouvrir de fichier temporaire pour l'URL mailto !"
 
 #. #define INC_ORIG_MSG_PROMPT
 #: LYMessages.c:197
 msgid "Do you wish to include the original message?"
-msgstr "Voulez-vous inclure le message d'origine?"
+msgstr "Voulez-vous inclure le message d'origine ?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
 #: LYMessages.c:199
 msgid "Do you wish to include the preparsed source?"
-msgstr "Voulez-vous inclure la source pré-analysée?"
+msgstr "Voulez-vous inclure la source pré-analysée ?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
 #: LYMessages.c:201
 msgid "Spawning your selected editor to edit mail message"
-msgstr "Lancement de votre éditeur de choix pour l'édition du message"
+msgstr "Lancement de votre éditeur de choix pour l'édition du courriel"
 
 #. #define ERROR_SPAWNING_EDITOR
 #: LYMessages.c:203
 msgid "Error spawning editor, check your editor definition in the options menu"
-msgstr "Erreur de lancement; vérifier les données sur l'éditeur dans les paramètres"
+msgstr "Erreur de lancement de l'éditeur ; vérifier la configuration de l'éditeur (menu options)"
 
 #: LYMessages.c:204
 msgid "Send this comment?"
-msgstr "Envoyer ce commentaire? "
+msgstr "Envoyer ce commentaire ? "
 
 #: LYMessages.c:205
 msgid "Send this message?"
-msgstr "Envoyer ce message? "
+msgstr "Envoyer ce message ? "
 
 #: LYMessages.c:206
 msgid "Sending your message..."
@@ -548,57 +553,57 @@ msgstr "Envoi de votre message..."
 
 #: LYMessages.c:207
 msgid "Sending your comment:"
-msgstr "Envoi de votre commentaire:"
+msgstr "Envoi de votre commentaire :"
 
 #. textarea
 #: LYMessages.c:210
 msgid "Not in a TEXTAREA; cannot use external editor."
-msgstr "Vous n'êtes pas dans une zone de texte, impossible d'utiliser l'éditeur externe."
+msgstr "Ce n'est pas une zone de texte, impossible d'utiliser l'éditeur externe."
 
 #: LYMessages.c:211
 msgid "Not in a TEXTAREA; cannot use command."
-msgstr "Vous n'êtes pas dans une zone de texte, impossible d'utiliser cette commande."
+msgstr "Ce n'est pas une zone de texte, impossible d'utiliser cette commande."
 
 #: LYMessages.c:213
 msgid "file: ACTIONs are disallowed!"
-msgstr "L'attribut ACTION n'est pas permis avec l'URL 'file:'"
+msgstr "Aucune action autorisée avec une URL 'file:'"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
 #: LYMessages.c:215
 msgid "file: URLs via served links are disallowed!"
-msgstr "L'URL 'file:' n'est pas permis dans les liens du serveur"
+msgstr "Une URL 'file:' n'est pas admise dans les liens servis."
 
 #: LYMessages.c:216
 msgid "Access to local files denied."
-msgstr "L'accès aux fichiers cachés est désactivé!"
+msgstr "L'accès aux fichiers locaux est refusé !"
 
 #: LYMessages.c:217
 msgid "file: URLs via bookmarks are disallowed!"
-msgstr "L'URL 'file:' n'est pas permis dans les signets"
+msgstr "Une URL 'file:' n'est pas autorisée dans les signets."
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
 #: LYMessages.c:219
 msgid "This special URL is not allowed in external documents!"
-msgstr "Cet URL spécial n'est pas permis dans les documents externes!"
+msgstr "Cette URL spéciale n'est pas autorisée dans les documents externes !"
 
 #: LYMessages.c:220
 msgid "Press <return> to return to Lynx."
-msgstr "Appuyez sur <Entr> pour retourner à Lynx  "
+msgstr "Pressez <Entrée> pour retourner à Lynx."
 
 #. #define SPAWNING_MSG
 #: LYMessages.c:223
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
-msgstr "Lancement du sous-processus DCL; «logout» pour retourner à Lynx.\n"
+msgstr "Sous-processus DCL lancé ; saisir \"logout\" pour retourner à Lynx.\n"
 
 #. #define SPAWNING_MSG
 #: LYMessages.c:227
 msgid "Type EXIT to return to Lynx.\n"
-msgstr "Pressez ECHAP pour retourner à lynx.\n"
+msgstr "Saisir \"exit\" pour retourner à Lynx.\n"
 
 #. #define SPAWNING_MSG
 #: LYMessages.c:230
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
-msgstr "Lancement du shell implicite. Entrez «exit» pour retourner à Lynx.\n"
+msgstr "Lancement du shell par défaut. Saisir \"exit\" pour retourner à Lynx.\n"
 
 #: LYMessages.c:233
 msgid "Spawning is currently disabled."
@@ -606,7 +611,7 @@ msgstr "Le lancement est présentement désactivé."
 
 #: LYMessages.c:234
 msgid "The 'd'ownload command is currently disabled."
-msgstr "La commande «d» (décharger) est présentement désactivée."
+msgstr "La commande \"d\" (télécharger) est présentement désactivée."
 
 #: LYMessages.c:235
 msgid "You cannot download an input field."
@@ -622,11 +627,11 @@ msgstr "Vous ne pouvez pas télécharger un lien mailto."
 
 #: LYMessages.c:238
 msgid "You cannot download cookies."
-msgstr "Vous ne pouvez télécharger les cookies."
+msgstr "Vous ne pouvez pas télécharger les cookies."
 
 #: LYMessages.c:239
 msgid "You cannot download a printing option."
-msgstr "Impossible de télécharger une option d'impression"
+msgstr "Impossible de télécharger une option d'impression."
 
 #: LYMessages.c:240
 msgid "You cannot download an upload option."
@@ -638,7 +643,7 @@ msgstr "Impossible de télécharger une option de permission."
 
 #: LYMessages.c:242
 msgid "This special URL cannot be downloaded!"
-msgstr "Cet URL spécial ne peut être déchargé!"
+msgstr "Cette URL spéciale ne peut être téléchargée !"
 
 #: LYMessages.c:243
 msgid "Nothing to download."
@@ -655,7 +660,7 @@ msgstr "Traçage DÉSACTIVÉ"
 #. #define CLICKABLE_IMAGES_ON
 #: LYMessages.c:247
 msgid "Links will be included for all images!  Reloading..."
-msgstr "Les liens seront inclus pour toutes les images! Chargement..."
+msgstr "Les liens seront inclus pour toutes les images ! Chargement..."
 
 #. #define CLICKABLE_IMAGES_OFF
 #: LYMessages.c:249
@@ -665,20 +670,20 @@ msgstr "Traitement d'image standard restauré. Chargement... "
 #. #define PSEUDO_INLINE_ALTS_ON
 #: LYMessages.c:251
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
-msgstr "'pseudo-ALT' sera assigné aux images incluses sans l'attribut ALT!  Chargement..."
+msgstr "De pseudos champs \"ALT\" seront assignées aux images sans \"ALT\" !  Chargement..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
 #: LYMessages.c:253
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
-msgstr "Les images incluses sans l'attribut ALT seront ignorées!  Chargement..."
+msgstr "Les images incluses sans l'attribut ALT seront ignorées !  Chargement..."
 
 #: LYMessages.c:254
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
-msgstr "Le mode 8-bits ou CJK est réglé à DÉSACTIVÉ! Chargement..."
+msgstr "Modes 8-bits \"brut\" ou CJK désactivés ! Chargement..."
 
 #: LYMessages.c:255
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
-msgstr "Le mode 8-bits ou CJK est réglé à ACTIVÉ! Chargement..."
+msgstr "Modes 8-bits \"brut\" ou CJK activés ! Chargement..."
 
 #. #define HEAD_D_L_OR_CANCEL
 #: LYMessages.c:257
@@ -692,40 +697,40 @@ msgstr "Envoyer requête HEAD pour D)ocument ou C) Annuler? (d,c) :"
 
 #: LYMessages.c:260
 msgid "Sorry, the document is not an http URL."
-msgstr "Désolé, le document n'est pas un URL http."
+msgstr "Désolé, le document n'est pas une URL http."
 
 #: LYMessages.c:261
 msgid "Sorry, the link is not an http URL."
-msgstr "Désolé, le document n'est pas un URL http."
+msgstr "Désolé, le document n'est pas une URL http."
 
 #: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is disabled."
-msgstr "Désolé, l'attribut ACTION est invalidé pour ce formulaire."
+msgstr "Désolé, l'attribut ACTION est désactivé pour ce formulaire."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
 #: LYMessages.c:264
 msgid "Sorry, the ACTION for this form is not an http URL."
-msgstr "Désolé, l'attribut ACTION pour ce formulaire n'est pas un URL http."
+msgstr "Désolé, l'attribut ACTION de ce formulaire n'est pas une URL http."
 
 #: LYMessages.c:265
 msgid "Not an http URL or form ACTION!"
-msgstr "L'élément n'est ni un URL http ni un attribut ACTION!"
+msgstr "L'élément n'est ni une URL http ni un attribut ACTION !"
 
 #: LYMessages.c:266
 msgid "This special URL cannot be a form ACTION!"
-msgstr "Cet URL spécial ne peut être un attribut ACTION"
+msgstr "Cette URL spéciale ne peut être un attribut ACTION !"
 
 #: LYMessages.c:267
 msgid "URL is not in starting realm!"
-msgstr "L'URL n'est pas dans la partition de départ spécifiée"
+msgstr "L'URL n'est pas dans la hiérarchie de départ !"
 
 #: LYMessages.c:268
 msgid "News posting is disabled!"
-msgstr "L'envoi d'articles Usenet est désactivé"
+msgstr "L'envoi d'articles Usenet est désactivé !"
 
 #: LYMessages.c:269
 msgid "File management support is disabled!"
-msgstr "Le soutien de gestion de fichier est désactivé."
+msgstr "Le support de la gestion de fichiers est désactivé !"
 
 #: LYMessages.c:270
 msgid "No jump file is currently available."
@@ -737,15 +742,15 @@ msgstr "Accès à (entrez '?' pour la liste des raccourcis) : "
 
 #: LYMessages.c:272
 msgid "Jumping to a shortcut URL is disallowed!"
-msgstr "L'accès à un URL par raccourci est invalidé!"
+msgstr "L'accès à un raccourci URL est désactivé !"
 
 #: LYMessages.c:273
 msgid "Random URL is disallowed!  Use a shortcut."
-msgstr "L'accès arbitraire à un URL est invalidé. Utilisez un raccourci."
+msgstr "L'accès aléatoire URL est désactivé. Utilisez un raccourci."
 
 #: LYMessages.c:274
 msgid "No random URLs have been used thus far."
-msgstr "Aucun URL arbitraire n'a encore été utilisé."
+msgstr "Aucune URL aléatoire n'a encore été utilisée."
 
 #: LYMessages.c:275
 msgid "Bookmark features are currently disabled."
@@ -764,7 +769,7 @@ msgstr "Le fichier de signets n'est pas défini. Utilisez %s pour voir les option
 #. #define NO_TEMP_FOR_HOTLIST
 #: LYMessages.c:280
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
-msgstr "Impossible d'ouvrir le fichier temporaire. pour convertir les signets X Mosaic"
+msgstr "Impossible d'ouvrir le fichier temporaire pour convertir les favoris X Mosaic."
 
 #: LYMessages.c:281
 msgid "ERROR - unable to open bookmark file."
@@ -773,12 +778,12 @@ msgstr "ERREUR - impossible d'ouvrir le fichier de signets."
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
 #: LYMessages.c:283
 msgid "Unable to open bookmark file for deletion of link."
-msgstr "Impossible d'ouvrir le fichier de signets pour supprimer un lien"
+msgstr "Impossible d'ouvrir le fichier de signets pour supprimer un lien."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
 #: LYMessages.c:285
 msgid "Unable to open scratch file for deletion of link."
-msgstr "Impossible d'ouvrir le fichier de travail pour supprimer un lien"
+msgstr "Impossible d'ouvrir le fichier de travail pour supprimer un lien."
 
 #: LYMessages.c:287
 msgid "Error renaming scratch file."
@@ -796,12 +801,12 @@ msgstr "Impossible de copier le fichier temporaire (pour l'effacement du lien)."
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
 #: LYMessages.c:293
 msgid "Unable to reopen temporary file for deletion of link."
-msgstr "Impossible de d clore le fichier temporaire pour supprimer un lien"
+msgstr "Impossible de réouvrir le fichier temporaire pour supprimer un lien."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
 #: LYMessages.c:296
 msgid "Link is not by itself all on one line in bookmark file."
-msgstr "Le lien ne tient pas sur une seule ligne dans le fichier de signets"
+msgstr "Le lien ne tient pas sur une seule ligne dans le fichier de signets."
 
 #: LYMessages.c:297
 msgid "Bookmark deletion failed."
@@ -810,40 +815,39 @@ msgstr "Impossible de supprimer le signet."
 #. #define BOOKMARKS_NOT_TRAVERSED
 #: LYMessages.c:299
 msgid "Bookmark files cannot be traversed (only http URLs)."
-msgstr "Les fichiers de signets ne peuvent être parcourus (seuls les URL http)"
+msgstr "Les fichiers de signets ne peuvent être parcourus (URL http seulement)."
 
 #. #define BOOKMARKS_NOT_OPEN
 #: LYMessages.c:301
 msgid "Unable to open bookmark file, use 'a' to save a link first"
-msgstr "Impossible d'ouvrir le fichier; tapez 'a' pour enreg. un lien d'abord"
+msgstr "Impossible d'ouvrir les signets r; tapez 'a' pour enreg. un lien d'abord."
 
 #: LYMessages.c:302
 msgid "There are no links in this bookmark file!"
-msgstr "Il n'y a aucun lien dans ce fichier!"
+msgstr "Il n'y a aucun signet dans ce fichier !"
 
 #. #define CACHE_D_OR_CANCEL
 #: LYMessages.c:304
-#, fuzzy
 msgid "D)elete cached document or C)ancel? (d,c): "
-msgstr "Envoyer requête HEAD pour D)ocument ou C) Annuler? (d,c) :"
+msgstr "D)supprimer le document du cache ou C)annuler (d,c) ?"
 
 #. #define BOOK_D_L_OR_CANCEL
 #: LYMessages.c:306
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
-msgstr "D) Enreg. le document, L) Enreg. le lien ou C) Annuler? (d,l,c) : "
+msgstr "Enregistrer le D)ocument ou le L)ien comme signet ou C) Annuler? (d,l,c) : "
 
 #: LYMessages.c:307
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
-msgstr "D) Enreg. le Document sous fichier de signets ou C) Annuler? (d,c) : "
+msgstr "Enregistrer le D)ocument dans les signets ou C) Annuler? (d,c) : "
 
 #: LYMessages.c:308
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
-msgstr "L) Enreg. le Lien sous fichier de signets ou C) Annuler? (l,c) : "
+msgstr "Enregistrer le L)ien dans les signets ou C) Annuler? (l,c) : "
 
 #. #define NOBOOK_POST_FORM
 #: LYMessages.c:310
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
-msgstr "Les documents ayant un contenu POST ne peuvent être marqués d'un signet"
+msgstr "Les documents envoyés par POST ne peuvent être marqués d'un signet."
 
 #: LYMessages.c:311
 msgid "Cannot save form fields/links"
@@ -857,7 +861,7 @@ msgstr "Historique, Information, Menu et Références ne peuvent être des signets"
 #. #define CONFIRM_BOOKMARK_DELETE
 #: LYMessages.c:315
 msgid "Do you really want to delete this link from your bookmark file?"
-msgstr "Voulez-vous vraiment supprimer ce lien de vos signets?"
+msgstr "Voulez-vous vraiment supprimer ce lien de vos signets ?"
 
 #: LYMessages.c:316
 msgid "Malformed address."
@@ -871,7 +875,7 @@ msgstr "Analyse historique ACTIVÉE (analyse minimale annulée)"
 #. #define HISTORICAL_OFF_MINIMAL_ON
 #: LYMessages.c:320
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
-msgstr "Analyse historique DÉSACTIVÉE (analyse minimale en cours)"
+msgstr "Analyse historique DÉSACTIVÉE (analyse minimale activée)"
 
 #. #define HISTORICAL_ON_VALID_OFF
 #: LYMessages.c:322
@@ -881,7 +885,7 @@ msgstr "Analyse historique ACTIVÉE (analyse de validation annulée)"
 #. #define HISTORICAL_OFF_VALID_ON
 #: LYMessages.c:324
 msgid "Historical comment parsing OFF (Valid is in effect)!"
-msgstr "Analyse historique DÉSACTIVÉE (analyse de validation en cours)"
+msgstr "Analyse historique DÉSACTIVÉE (validation activée)"
 
 #. #define MINIMAL_ON_IN_EFFECT
 #: LYMessages.c:326
@@ -905,11 +909,11 @@ msgstr "Analyse minimale DÉSACTIVÉE (l'analyse historique est en cours)"
 
 #: LYMessages.c:333
 msgid "Soft double-quote parsing ON!"
-msgstr "Analyse à tolérance de fautes (soft double-quote) ACTIVÉE"
+msgstr "Analyse tolérante sur les guillemets ACTIVÉE"
 
 #: LYMessages.c:334
 msgid "Soft double-quote parsing OFF!"
-msgstr "Analyse à tolérance de fautes (soft double-quote) DÉSACTIVÉE"
+msgstr "Analyse tolérante sur les guillemets DÉSACTIVÉE"
 
 #: LYMessages.c:335
 msgid "Now using TagSoup parsing of HTML."
@@ -948,84 +952,84 @@ msgstr "Vous êtes déjà au premier document."
 
 #: LYMessages.c:342
 msgid "There are no links above this line of the document."
-msgstr "Il n'y a pas de lien au-delà de cette ligne dans le document"
+msgstr "Il n'y a pas de lien au-dessus de cette ligne dans le document."
 
 #: LYMessages.c:343
 msgid "There are no links below this line of the document."
-msgstr "Il n'y a pas de lien en deçà de cette ligne dans le document"
+msgstr "Il n'y a pas de lien en dessous de cette ligne dans le document."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
 #: LYMessages.c:345
 msgid "Maximum length reached!  Delete text or move off field."
-msgstr "Vous avez le maximum permis; supprimez du texte ou quittez le champ"
+msgstr "Longueur maximale atteinte ; effacez du texte ou quittez le champ."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
 #: LYMessages.c:347
 msgid "You are not on a form submission button or normal link."
-msgstr "Vous n'êtes pas à un bouton Envoyer ou un lien normal."
+msgstr "Vous n'êtes pas sur un bouton Envoyer ou un lien normal."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
 #: LYMessages.c:349
 msgid "One radio button must be checked at all times!"
-msgstr "Un seul bouton d'option peut être coché à la fois."
+msgstr "Un seul bouton radio peut être coché à la fois."
 
 #: LYMessages.c:350
 msgid "No submit button for this form, submit single text field?"
-msgstr "Pas de bouton soumettre pour ce formulaire: ne soumettre que ce champ texte ?"
+msgstr "Pas de bouton d'envoi pour ce formulaire, soumettre ce seul champ texte ?"
 
 #: LYMessages.c:351
 msgid "Do you want to go back to the previous document?"
-msgstr "Voulez-vous retourner au document précédent?"
+msgstr "Voulez-vous retourner au document précédent ?"
 
 #: LYMessages.c:352
 msgid "Use arrows or tab to move off of field."
-msgstr "Touches fléchées ou tabulateur pour se déplacer hors du champ"
+msgstr "Utilisez <flèches> ou <tab> pour quitter le champ."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
 #: LYMessages.c:354
 msgid "Enter text.  Use arrows or tab to move off of field."
-msgstr "Entrez le texte. Touches HAUT/BAS ou tabulateur pour vous déplacer."
+msgstr "Entrez le texte. Déplacez-vous avec <flèches> ou <tab>."
 
 #: LYMessages.c:355
 msgid "** Bad HTML!!  No form action defined. **"
-msgstr "** Erreur de code HTML! Aucune action définie pour le formulaire. **"
+msgstr "** Erreur HTML ! Aucune action définie pour le formulaire. **"
 
 #: LYMessages.c:356
 msgid "Bad HTML!!  Unable to create popup window!"
-msgstr "Erreur de code HTML! Impossible de créer de fenêtre flash."
+msgstr "Erreur de code HTML ! Impossible de créer de fenêtre popup."
 
 #: LYMessages.c:357
 msgid "Unable to create popup window!"
-msgstr "Impossible de créer de fenêtre flash."
+msgstr "Impossible de créer de fenêtre popup."
 
 #: LYMessages.c:358
 msgid "Goto a random URL is disallowed!"
-msgstr "Accès à un URL arbitraire invalidé."
+msgstr "Accès à une URL aléatoire désactivé."
 
 #: LYMessages.c:359
 msgid "Goto a non-http URL is disallowed!"
-msgstr "Accès à un URL non http invalidé."
+msgstr "Accès à une URL non http invalidé."
 
 #: LYMessages.c:360
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
-msgstr "Vous ne pouvez accéder aux URL «%s:»"
+msgstr "Vous ne pouvez accéder aux URL «%s»"
 
 #: LYMessages.c:361
 msgid "URL to open: "
-msgstr "URL à ouvrir: "
+msgstr "URL à ouvrir : "
 
 #: LYMessages.c:362
 msgid "Edit the current Goto URL: "
-msgstr "Éditer la commande Goto URL en cours :"
+msgstr "Éditer la commande \"Aller à URL\" en cours :"
 
 #: LYMessages.c:363
 msgid "Edit the previous Goto URL: "
-msgstr "Éditer la commande Goto URL précédente :"
+msgstr "Éditer la commande \"Aller à URL\" précédente :"
 
 #: LYMessages.c:364
 msgid "Edit a previous Goto URL: "
-msgstr "Éditer une commande Goto URL précédente :"
+msgstr "Éditer une commande \"Aller à URL\" précédente :"
 
 #: LYMessages.c:365
 msgid "Current document has POST data."
@@ -1037,7 +1041,7 @@ msgstr "Éditer l'URL de ce document :"
 
 #: LYMessages.c:367
 msgid "Edit the current link's URL: "
-msgstr "Éditer l'URL relative au lien courant: "
+msgstr "Éditer l'URL relative au lien courant : "
 
 #: LYMessages.c:368
 msgid "You cannot edit File Management URLs"
@@ -1045,7 +1049,7 @@ msgstr "Vous ne pouvez pas éditer les URL de gestion de fichier."
 
 #: LYMessages.c:369
 msgid "Enter a database query: "
-msgstr "Entrez une recherche dans la base de données : "
+msgstr "Entrez une requête de base de données : "
 
 #: LYMessages.c:370
 msgid "Enter a whereis query: "
@@ -1066,7 +1070,7 @@ msgstr "Éditer une recherche précédente :"
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
 #: LYMessages.c:375
 msgid "Use Control-R to resubmit the current query."
-msgstr "Faites Ctrl-R pour lancer de nouveau la recherche en cours"
+msgstr "Faites <Ctrl-R> pour soumettre de nouveau la demande."
 
 #: LYMessages.c:376
 msgid "Edit the current shortcut: "
@@ -1083,7 +1087,7 @@ msgstr "Éditer un raccourci précédent :"
 #: LYMessages.c:379
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
-msgstr "Touche '%c' non configurée pour correspondre à un fichier-raccourci"
+msgstr "Touche '%c' non configurée pour correspondre à un raccourci !"
 
 #: LYMessages.c:380
 msgid "Cannot locate jump file!"
@@ -1103,7 +1107,7 @@ msgstr "Mémoire insuffisante pour lire le fichier-raccourci."
 
 #: LYMessages.c:384
 msgid "Out of memory reading jump table!"
-msgstr "Mémoire insuffisante pour lire les tables de raccourcis"
+msgstr "Mémoire insuffisante pour lire les tables de raccourcis !"
 
 #: LYMessages.c:385
 msgid "No index is currently available."
@@ -1112,7 +1116,7 @@ msgstr "Aucun index n'est présentement disponible."
 #. #define CONFIRM_MAIN_SCREEN
 #: LYMessages.c:387
 msgid "Do you really want to go to the Main screen?"
-msgstr "Voulez-vous vraiment aller à l'écran principal?"
+msgstr "Voulez-vous vraiment aller à l'écran principal ?"
 
 #: LYMessages.c:388
 msgid "You are already at main screen!"
@@ -1126,20 +1130,20 @@ msgstr "Document non indexé - faites '/' pour chercher une séquence de texte."
 #. #define NO_OWNER
 #: LYMessages.c:392
 msgid "No owner is defined for this file so you cannot send a comment"
-msgstr "Aucun propriétaire pour ce fichier; impossible d'envoyer un commentaire"
+msgstr "Aucun propriétaire pour ce fichier ; impossible d'envoyer un commentaire."
 
 #: LYMessages.c:393
 #, c-format
 msgid "No owner is defined. Use %s?"
-msgstr "Aucun propriétaire n'est défini.  Utiliser %s?"
+msgstr "Aucun propriétaire n'est défini.  Utiliser %s ?"
 
 #: LYMessages.c:394
 msgid "Do you wish to send a comment?"
-msgstr "Voulez-vous envoyer un commentaire?"
+msgstr "Voulez-vous envoyer un commentaire ?"
 
 #: LYMessages.c:395
 msgid "Mail is disallowed so you cannot send a comment"
-msgstr "Fonction de courrier invalidée; impossible d'envoyer un commentaire"
+msgstr "Fonction de courrier désactivée ; impossible d'envoyer un commentaire"
 
 #: LYMessages.c:396
 msgid "The 'e'dit command is currently disabled."
@@ -1147,7 +1151,7 @@ msgstr "La commande 'e' (Éditer) est présentement désactivée."
 
 #: LYMessages.c:397
 msgid "External editing is currently disabled."
-msgstr "Le soutien externe est présentement inactivé."
+msgstr "L'édition externe est présentement désactivée."
 
 #: LYMessages.c:398
 msgid "System error - failure to get status."
@@ -1163,23 +1167,23 @@ msgstr "La commande 'p' (Imprimer) est présentement désactivée."
 
 #: LYMessages.c:401
 msgid "Document has no Toolbar links or Banner."
-msgstr "Aucun lien vers une barre d'outil ou une bannière"
+msgstr "Aucun lien vers une barre d'outil ou une bannière."
 
 #: LYMessages.c:402
 msgid "Unable to open traversal file."
-msgstr "Impossible d'ouvrir le fichier de parcours."
+msgstr "Impossible d'ouvrir le fichier des URL parcourues."
 
 #: LYMessages.c:403
 msgid "Unable to open traversal found file."
-msgstr "Impossible d'ouvrir le fichier de parcours trouvé."
+msgstr "Impossible d'ouvrir le fichier de parcours des URL trouvées."
 
 #: LYMessages.c:404
 msgid "Unable to open reject file."
-msgstr "Impossible d'ouvrir le fichier rejeté."
+msgstr "Impossible d'ouvrir le fichier des URL rejetées."
 
 #: LYMessages.c:405
 msgid "Unable to open traversal errors output file"
-msgstr "Impossible d'ouvrir le fichier sortie d'erreurs de parcours"
+msgstr "Impossible d'ouvrir le fichier des URL parcourues erronées."
 
 #: LYMessages.c:406
 msgid "TRAVERSAL WAS INTERRUPTED"
@@ -1187,7 +1191,7 @@ msgstr "PARCOURS INTERROMPU"
 
 #: LYMessages.c:407
 msgid "Follow link (or goto link or page) number: "
-msgstr "Accéder au lien (commande G) Aller) numéro : "
+msgstr "Suivre le lien (ou aller à la page) numéro : "
 
 #: LYMessages.c:408
 msgid "Select option (or page) number: "
@@ -1220,11 +1224,11 @@ msgstr "Vous avez entré un numéro d'option non valide."
 
 #: LYMessages.c:417
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
-msgstr "** Erreur de code HTML! Utiliser -trace pour le diagnostic. **"
+msgstr "** Erreur de code HTML ! Utiliser -trace pour le diagnostic. **"
 
 #: LYMessages.c:418
 msgid "Give name of file to save in"
-msgstr "Donnez le nom du fichier à sauvegarder."
+msgstr "Donnez le nom du fichier où sauvegarder."
 
 #: LYMessages.c:419
 msgid "Can't save data to file -- please run WWW locally"
@@ -1232,11 +1236,11 @@ msgstr "Impossible d'enregistrer les données dans le fichier -- Merci d'utiliser
 
 #: LYMessages.c:420
 msgid "Can't open temporary file!"
-msgstr "Impossible d'ouvrir le fichier temporaire!"
+msgstr "Impossible d'ouvrir le fichier temporaire !"
 
 #: LYMessages.c:421
 msgid "Can't open output file!  Cancelling!"
-msgstr "Impossible d'ouvrir le fichier de sortie! Demande annulée."
+msgstr "Impossible d'ouvrir le fichier de sortie ! Demande annulée."
 
 #: LYMessages.c:422
 msgid "Execution is disabled."
@@ -1246,7 +1250,7 @@ msgstr "L'exécution est désactivée."
 #: LYMessages.c:424
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
-msgstr "Exécution non activée pour ce fichier. Voir les paramètres (use %s)."
+msgstr "Exécution désactivée pour ce fichier. Voir les paramètres (use %s)."
 
 #. #define EXECUTION_NOT_COMPILED
 #: LYMessages.c:426
@@ -1260,16 +1264,16 @@ msgstr "Ce fichier ne peut être affiché sur votre terminal."
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
 #: LYMessages.c:429
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
-msgstr "Ne peut être affiché sur votre terminal:  D) Décharger ou C) Annuler  "
+msgstr "Ne peut être affiché sur votre terminal:  D) Télécharger ou C) Annuler  "
 
 #: LYMessages.c:430
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
-msgstr "%s  D) Décharger ou C) Annuler"
+msgstr "%s  D) Télécharger ou C) Annuler"
 
 #: LYMessages.c:431
 msgid "Cancelling file."
-msgstr "Annulation!"
+msgstr "Annulation."
 
 #: LYMessages.c:432
 msgid "Retrieving file.  - PLEASE WAIT -"
@@ -1297,11 +1301,11 @@ msgstr "Le nom de fichier ne peut commencer avec un point."
 
 #: LYMessages.c:439
 msgid "File exists.  Create higher version?"
-msgstr "Ce fichier existe déjà. Créer une nouvelle version?"
+msgstr "Ce fichier existe déjà. Créer une nouvelle version ?"
 
 #: LYMessages.c:441
 msgid "File exists.  Overwrite?"
-msgstr "Ce fichier existe déjà. Remplacer?"
+msgstr "Ce fichier existe déjà. Remplacer ?"
 
 #: LYMessages.c:443
 msgid "Cannot write to file."
@@ -1309,7 +1313,7 @@ msgstr "Écriture non autorisée."
 
 #: LYMessages.c:444
 msgid "ERROR! - download command is misconfigured."
-msgstr "ERREUR - la commande de déchargement est mal configurée."
+msgstr "ERREUR - la commande de téléchargement est mal configurée."
 
 #: LYMessages.c:445
 msgid "Unable to download file."
@@ -1351,7 +1355,7 @@ msgstr "Impossible de charger les données."
 #. #define CANNOT_EDIT_REMOTE_FILES
 #: LYMessages.c:455
 msgid "Lynx cannot currently (e)dit remote WWW files."
-msgstr "Lynx ne peut (e)diter de fichiers W3 distants."
+msgstr "Lynx ne peut (e)diter de fichiers WWW distants."
 
 #. #define CANNOT_EDIT_FIELD
 #: LYMessages.c:457
@@ -1388,16 +1392,16 @@ msgstr "Mot de passe : "
 
 #: LYMessages.c:465
 msgid "lynx: Username and Password required!!!"
-msgstr "lynx : nom d'utilisateur et mot de passe requis!"
+msgstr "lynx : nom d'utilisateur et mot de passe requis !"
 
 #: LYMessages.c:466
 msgid "lynx: Password required!!!"
-msgstr "lynx : mot de passe requis!"
+msgstr "lynx : mot de passe requis !"
 
 # LYMessages_en.h
 #: LYMessages.c:467
 msgid "Clear all authorization info for this session?"
-msgstr "Effacer toute l'information d'autorisation pour cette session?"
+msgstr "Effacer l'information d'autorisation de cette session?"
 
 #: LYMessages.c:468
 msgid "Authorization info cleared."
@@ -1409,7 +1413,7 @@ msgstr "L'autorisation a échouée. Réessayer ?"
 
 #: LYMessages.c:470
 msgid "cgi support has been disabled."
-msgstr "l'administrateur système a désactivé le soutien cgi."
+msgstr "support cgi désactivé."
 
 #. #define CGI_NOT_COMPILED
 #: LYMessages.c:472
@@ -1419,11 +1423,11 @@ msgstr "Fonctionnalités Lynxcgi non compilées dans cette version"
 #: LYMessages.c:473
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
-msgstr "Désolé. Aucun moyen connu de convertir  %s to %s. "
+msgstr "Désolé. Aucun moyen connu de convertir  %s en %s. "
 
 #: LYMessages.c:474
 msgid "Unable to set up connection."
-msgstr "Impossible de finaliser la connexion."
+msgstr "Impossible d'initialiser la connexion."
 
 #: LYMessages.c:475
 msgid "Unable to make connection"
@@ -1438,7 +1442,7 @@ msgstr "Lien exécutable rejeté dû à une demande erronée."
 #: LYMessages.c:479
 #, c-format
 msgid "Executable link rejected due to `%c' character."
-msgstr "Lien exécutable rejeté dû au caractère `%c'."
+msgstr "Lien exécutable rejeté dû au caractère \"%c\"."
 
 #. #define RELPATH_IN_EXEC_LINK
 #: LYMessages.c:481
@@ -1457,7 +1461,7 @@ msgstr "L'accès au courrier est désactivé."
 #. #define ACCESS_ONLY_LOCALHOST
 #: LYMessages.c:486
 msgid "Only files and servers on the local host can be accessed."
-msgstr "Seuls les fichiers/serveurs logés sur l'hôte local sont accessibles"
+msgstr "Seuls les fichiers/serveurs logés sur l'hôte local sont accessibles."
 
 #: LYMessages.c:487
 msgid "Telnet access is disabled!"
@@ -1494,7 +1498,7 @@ msgstr "Impossible d'ouvrir le fichier de commande."
 
 #: LYMessages.c:498
 msgid "News Post Cancelled!!!"
-msgstr "Envoi des nouvelles annulé!"
+msgstr "Envoi des news annulé !"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
 #: LYMessages.c:500
@@ -1503,7 +1507,7 @@ msgstr "Lancement de votre éditeur pour éditer un message"
 
 #: LYMessages.c:501
 msgid "Post this message?"
-msgstr "Envoyer ce message?"
+msgstr "Envoyer ce message ?"
 
 #: LYMessages.c:502
 #, c-format
@@ -1512,11 +1516,11 @@ msgstr "Adjoindre '%s'?"
 
 #: LYMessages.c:503
 msgid "Posting to newsgroup(s)..."
-msgstr "Envoi du message..."
+msgstr "Envoi du message (news)..."
 
 #: LYMessages.c:505
 msgid "*** You have unread mail. ***"
-msgstr "*** Vous avez du courrier non ouvert. ***"
+msgstr "*** Vous avez du courrier non lu. ***"
 
 #: LYMessages.c:507
 msgid "*** You have mail. ***"
@@ -1528,16 +1532,16 @@ msgstr "*** Vous avez du nouveau courrier. ***"
 
 #: LYMessages.c:510
 msgid "File insert cancelled!!!"
-msgstr "Insertion de fichier annulée!!"
+msgstr "Insertion de fichier annulée !"
 
 #: LYMessages.c:511
 msgid "Not enough memory for file!"
-msgstr "Mémoire insuffisante pour lire le fichier-raccourci."
+msgstr "Mémoire insuffisante pour le fichier !"
 
 # WWW/Libary/Implementation/HTFile.c
 #: LYMessages.c:512
 msgid "Can't open file for reading."
-msgstr "Impossible d'ouvrir le fichier pour décompression."
+msgstr "Impossible d'ouvrir le fichier en lecture."
 
 #: LYMessages.c:513
 msgid "File does not exist."
@@ -1545,7 +1549,7 @@ msgstr "Le fichier n'existe pas."
 
 #: LYMessages.c:514
 msgid "File does not exist - reenter or cancel:"
-msgstr "LE fichier n'existe pas - réessayer ou annuler:"
+msgstr "LE fichier n'existe pas - réessayer ou annuler :"
 
 #: LYMessages.c:515
 msgid "File is not readable."
@@ -1553,24 +1557,24 @@ msgstr "Le fichier n'est pas lisible."
 
 #: LYMessages.c:516
 msgid "File is not readable - reenter or cancel:"
-msgstr "Le fichier n'est pas lisible - réessayer ou annuler:"
+msgstr "Le fichier n'est pas lisible - réessayer ou annuler :"
 
 #: LYMessages.c:517
 msgid "Nothing to insert - file is 0-length."
-msgstr "Rien n'a insérer - le fichier est vide."
+msgstr "Rien à insérer - le fichier est vide."
 
 #: LYMessages.c:518
 msgid "Save request cancelled!!!"
-msgstr "Demande d'enregistrement annulée!"
+msgstr "Demande d'enregistrement annulée !"
 
 #: LYMessages.c:519
 msgid "Mail request cancelled!!!"
-msgstr "Demande de courrier annulée!"
+msgstr "Demande de courrier annulée !"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
 #: LYMessages.c:521
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
-msgstr "Lecture de la source pré-analysée. Veuillez confirmer l'envoi?"
+msgstr "Lecture de la source pré-analysée. Veuillez confirmer l'envoi par mail ?"
 
 #: LYMessages.c:522
 msgid "Please wait..."
@@ -1578,7 +1582,7 @@ msgstr "Veuillez attendre..."
 
 #: LYMessages.c:523
 msgid "Mailing file.  Please wait..."
-msgstr "Envoi du fichier.  Veuillez attendre..."
+msgstr "Envoi du fichier (mail). Veuillez attendre..."
 
 #: LYMessages.c:524
 msgid "ERROR - Unable to mail file"
@@ -1588,34 +1592,34 @@ msgstr "ERREUR - impossible d'envoyer le fichier."
 #: LYMessages.c:526
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
-msgstr "Le fichier représente %d écrans. Voulez-vous l'imprimer?"
+msgstr "Le fichier représente %d écrans. Voulez-vous l'imprimer ?"
 
 #: LYMessages.c:527
 msgid "Print request cancelled!!!"
-msgstr "Demande d'impression annulée!"
+msgstr "Demande d'impression annulée !"
 
 #: LYMessages.c:528
 msgid "Press <return> to begin: "
-msgstr "Appuyez sur <Entr> pour commencer : "
+msgstr "Pressez <Entrée> pour commencer : "
 
 #: LYMessages.c:529
 msgid "Press <return> to finish: "
-msgstr "Appuyez sur <Entr> pour terminer : "
+msgstr "Pressez <Entrée> pour terminer : "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
 #: LYMessages.c:531
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
-msgstr "Le fichier représente %d pages. Voulez-vous l'imprimer?"
+msgstr "Le fichier représente %d pages. Voulez-vous l'imprimer ?"
 
 #. #define CHECK_PRINTER
 #: LYMessages.c:533
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
-msgstr "Assurez vous que votre imprimante est allumée. Appuyez sur <Entr> pour démarrer l'impression."
+msgstr "Assurez vous que votre imprimante est allumée. Pressez <Entrée> pour démarrer l'impression."
 
 #: LYMessages.c:534
 msgid "ERROR - Unable to allocate file space!!!"
-msgstr "ERREUR - impossible d'allouer de l'espace pour le fichier!"
+msgstr "ERREUR - impossible d'allouer de l'espace pour le fichier !"
 
 #: LYMessages.c:535
 msgid "Unable to open tempfile"
@@ -1627,11 +1631,11 @@ msgstr "Impossible d'ouvrir le fichier d'options d'impression."
 
 #: LYMessages.c:537
 msgid "Printing file.  Please wait..."
-msgstr "Impression du fichier.  Veuillez attendre."
+msgstr "Impression du fichier. Veuillez attendre..."
 
 #: LYMessages.c:538
 msgid "Please enter a valid internet mail address: "
-msgstr "Veuillez entrer une adresse de courrier Internet valide : "
+msgstr "Veuillez entrer une adresse de courriel valide : "
 
 #: LYMessages.c:539
 msgid "ERROR! - printer is misconfigured!"
@@ -1640,38 +1644,38 @@ msgstr "ERREUR - l'imprimante est mal configurée."
 # src/LYMap.c
 #: LYMessages.c:540
 msgid "Image map from POST response not available!"
-msgstr "Image référencée de la réponse POST non disponible"
+msgstr "L'image réactive dans la réponse POST n'est pas disponible."
 
 #: LYMessages.c:541
 msgid "Misdirected client-side image MAP request!"
-msgstr "Erreur de demande d'image référencée client."
+msgstr "Mauvaise requête d'image réactive (MAP) côté client."
 
 #: LYMessages.c:542
 msgid "Client-side image MAP is not accessible!"
-msgstr "L'image référencée client n'est pas accessible."
+msgstr "L'image réactive (MAP) côté client n'est pas accessible."
 
 #: LYMessages.c:543
 msgid "No client-side image MAPs are available!"
-msgstr "Aucune image référencée client n'est disponible."
+msgstr "Aucune image réactive (MAP) disponible côté client."
 
 #: LYMessages.c:544
 msgid "Client-side image MAP is not available!"
-msgstr "L'image référencée client n'est pas disponible."
+msgstr "Image réactive (MAP) non disponible côté client."
 
 #. #define OPTION_SCREEN_NEEDS_24
 #: LYMessages.c:547
 msgid "Screen height must be at least 24 lines for the Options menu!"
-msgstr "La hauteur d'écran doit être au moins 24 lignes pour ce menu!"
+msgstr "La hauteur d'écran doit être d'au moins 24 lignes pour le menu Options !"
 
 #. #define OPTION_SCREEN_NEEDS_23
 #: LYMessages.c:549
 msgid "Screen height must be at least 23 lines for the Options menu!"
-msgstr "Hauteur d'écran : au moins 23 lignes pour le menu des paramètres"
+msgstr "La hauteur d'écran doit être d'au moins 23 lignes pour le menu Options !"
 
 #. #define OPTION_SCREEN_NEEDS_22
 #: LYMessages.c:551
 msgid "Screen height must be at least 22 lines for the Options menu!"
-msgstr "La hauteur d'écran doit être au moins 22 lignes pour ce menu!"
+msgstr "La hauteur d'écran doit être d'au moins 22 lignes pour le menu Options !"
 
 #: LYMessages.c:553
 msgid "That key requires Advanced User mode."
@@ -1680,7 +1684,7 @@ msgstr "Cette touche n'est active qu'en mode utilisateur avancé."
 #: LYMessages.c:554
 #, c-format
 msgid "Content-type: %s"
-msgstr "Type de contenu: %s"
+msgstr "Type de contenu : %s"
 
 #: LYMessages.c:555
 msgid "Command: "
@@ -1688,7 +1692,7 @@ msgstr "Commande :"
 
 #: LYMessages.c:556
 msgid "Unknown or ambiguous command"
-msgstr "Commande inconnue ou ambigue."
+msgstr "Commande inconnue ou ambiguë."
 
 #: LYMessages.c:557
 msgid " Version "
@@ -1700,11 +1704,11 @@ msgstr " premier"
 
 #: LYMessages.c:559
 msgid ", guessing..."
-msgstr ", analyse en cours..."
+msgstr ", analyse..."
 
 #: LYMessages.c:560
 msgid "Permissions for "
-msgstr "Permissions d'accès pour "
+msgstr "Permissions pour "
 
 #: LYMessages.c:561
 msgid "Select "
@@ -1736,7 +1740,7 @@ msgstr " index"
 
 #: LYMessages.c:568
 msgid " to return to Lynx."
-msgstr " pour retourner à Lynx"
+msgstr " pour retourner à Lynx."
 
 #: LYMessages.c:569
 msgid "Accept Changes"
@@ -1748,7 +1752,7 @@ msgstr "Annuler les changements"
 
 #: LYMessages.c:571
 msgid "Left Arrow cancels changes"
-msgstr "Flèche gauche pour annuler les changements"
+msgstr "<gauche> pour annuler les changements"
 
 #: LYMessages.c:572
 msgid "Save options to disk"
@@ -1756,47 +1760,47 @@ msgstr "Enregistrer les options sur disque"
 
 #: LYMessages.c:573
 msgid "Hit RETURN to accept entered data."
-msgstr "Appuyer sur ENTR pour accepter les données entrées."
+msgstr "Pressez <Entrée> pour valider les données saisies."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
 #: LYMessages.c:575
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
-msgstr "ENTR pour accepter les données; SUPPR pour récupérer les valeurs implicites"
+msgstr "Pressez <Entrée> pour valider la saisie, <suppr> pour les valeurs par défaut."
 
 #: LYMessages.c:576
 msgid "Value accepted!"
-msgstr "Valeur acceptée!"
+msgstr "Valeur acceptée !"
 
 #. #define VALUE_ACCEPTED_WARNING_X
 #: LYMessages.c:578
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
-msgstr "Valeur acceptée! NOTA : Lynx est configuré pour XWINDOWS!"
+msgstr "Valeur acceptée ! NB : Lynx est configuré pour XWINDOWS !"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
 #: LYMessages.c:580
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
-msgstr "Valeur acceptée!  NOTA : Lynx n'est PAS configuré pour XWINDOWS!"
+msgstr "Valeur acceptée !  NB : Lynx n'est PAS configuré pour XWINDOWS !"
 
 #: LYMessages.c:581
 msgid "You are not allowed to change which editor to use!"
-msgstr "Vous ne pouvez pas choisir un autre éditeur!"
+msgstr "Vous ne pouvez pas choisir un autre éditeur !"
 
 #: LYMessages.c:582
 msgid "Failed to set DISPLAY variable!"
-msgstr "Impossible de régler la variable AFFICHAGE."
+msgstr "Impossible de régler la variable DISPLAY."
 
 #: LYMessages.c:583
 msgid "Failed to clear DISPLAY variable!"
-msgstr "Impossible d'effacer la variable AFFICHAGE."
+msgstr "Impossible d'effacer la variable DISPLAY."
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
 #: LYMessages.c:585
 msgid "You are not allowed to change the bookmark file!"
-msgstr "Changement du fichier de signets non autorisé!"
+msgstr "Changement du fichier de signets non autorisé !"
 
 #: LYMessages.c:586
 msgid "Terminal does not support color"
-msgstr "Le terminal ne permet pas l'affichage couleur"
+msgstr "Le terminal ne supporte pas l'affichage en couleur"
 
 #: LYMessages.c:587
 #, c-format
@@ -1805,22 +1809,22 @@ msgstr "Votre terminal '%s' ne permet pas l'affichage couleur."
 
 #: LYMessages.c:588
 msgid "Access to dot files is disabled!"
-msgstr "L'accès aux fichiers cachés est désactivé!"
+msgstr "Accès aux fichiers cachés désactivé."
 
 #. #define UA_NO_LYNX_WARNING
 #: LYMessages.c:590
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
-msgstr "La chaîne de caractères 'User-Agent' ne contient ni \"Lynx\" ni \"L_y_n_x\""
+msgstr "La chaîne 'User-Agent' ne contient ni \"Lynx\" ni \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
 #: LYMessages.c:592
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
-msgstr "Utilisez \"L_y_n_x\" ou \"Lynx\" dans le champs 'User-Agent' ou cela apparaîtra comme une erreur volontaire"
+msgstr "Utilisez \"L_y_n_x\" ou \"Lynx\" dans le champ 'User-Agent' ou cela apparaîtra comme une erreur volontaire !"
 
 #. #define UA_CHANGE_DISABLED
 #: LYMessages.c:594
 msgid "Changing of the User-Agent string is disabled!"
-msgstr "La modification du champ 'User-Agent' n'est pas activée"
+msgstr "La modification du champ 'User-Agent' est interdite !"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
 #: LYMessages.c:596
@@ -1841,65 +1845,65 @@ msgstr "Impossible d'enregistrer les options!"
 
 #: LYMessages.c:600
 msgid " 'r' to return to Lynx "
-msgstr " Entrez « r » pour retourner à Lynx. "
+msgstr "Pressez \"r\" pour retourner à Lynx. "
 
 #: LYMessages.c:601
 msgid " '>' to save, or 'r' to return to Lynx "
-msgstr " Entrez « > » pour enregistrer; « r » pour retourner à Lynx."
+msgstr "\">\" pour enregistrer, \"r\" pour retourner à Lynx."
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
 #: LYMessages.c:603
 msgid "Hit any key to change value; RETURN to accept."
-msgstr "N'importe quelle touche pour changer la valeur; ENTR pour accepter"
+msgstr "Touche quelconque pour changer la valeur, <Entrée> pour accepter."
 
 #: LYMessages.c:604
 msgid "Error uncompressing temporary file!"
-msgstr "Erreur de décompression du fichier temporaire!"
+msgstr "Erreur de décompression du fichier temporaire !"
 
 #: LYMessages.c:605
 msgid "Unsupported URL scheme!"
-msgstr "Schème de URL non reconnu!"
+msgstr "Schèma d'URL non supporté !"
 
 #: LYMessages.c:606
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
-msgstr "Données non reconnues; consultez la page d'informations pour le moment"
+msgstr "Données URL non reconnues, utilisez SHOWINFO pour l'instant."
 
 #: LYMessages.c:607
 msgid "Redirection limit of 10 URL's reached."
-msgstr "Réacheminement : limite de 10 URL atteinte."
+msgstr "Limite des redirection de 10 URL atteinte."
 
 #: LYMessages.c:608
 msgid "Illegal redirection URL received from server!"
-msgstr "URL de réacheminement illégal reçu du serveur!"
+msgstr "URL de redirection illégale reçue du serveur !"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
 #: LYMessages.c:610
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
-msgstr "Le serveur a demandé %d réacheminement du contenu POST vers"
+msgstr "Le serveur a demandé la redirection %d du contenu POST vers"
 
 #: LYMessages.c:613
 msgid "P)roceed, use G)ET or C)ancel "
-msgstr "P) Continuer, utiliser G)ET ou C) Annuler "
+msgstr "P)rocéder, obtenir par G)ET ou C)Annuler "
 
 #: LYMessages.c:614
 msgid "P)roceed, or C)ancel "
-msgstr "P) Continuer ou C) Annuler "
+msgstr "P)rocéder ou C) Annuler "
 
 #. #define ADVANCED_POST_GET_REDIRECT
 #: LYMessages.c:616
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
-msgstr "Réacheminement du contenu POST. P)Continuer, U)RL, G)ET ou C) Annuler"
+msgstr "Redirection du contenu POST. P)rocéder, voir l' U)RL, G)ET ou C) Annuler"
 
 #. #define ADVANCED_POST_REDIRECT
 #: LYMessages.c:618
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
-msgstr "Réacheminement du contenu POST. P)Continuer, U)RL ou C) Annuler"
+msgstr "Réacheminement du contenu POST. P)rocéder, voir l' U)RL ou C) Annuler"
 
 #. #define CONFIRM_POST_RESUBMISSION
 #: LYMessages.c:620
 msgid "Document from Form with POST content.  Resubmit?"
-msgstr "Document FORM avec contenu POST. Envoyer de nouveau?"
+msgstr "Document FORM avec contenu POST. Envoyer de nouveau ?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
 #: LYMessages.c:622
@@ -1911,43 +1915,43 @@ msgstr "Ré-envoyer le contenu POST vers %s ?"
 #: LYMessages.c:624
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
-msgstr "Liste d'un document avec données POST. Recharger %s ?"
+msgstr "Liste depuis un document avec données POST. Recharger %s ?"
 
 #. #define CONFIRM_POST_DOC_HEAD
 #: LYMessages.c:626
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
-msgstr "Document de type POST; l'élément HEAD peut être inconnu. Procéder?"
+msgstr "Document de type POST, l'élément HEAD peut être mal compris. Procéder ?"
 
 #. #define CONFIRM_POST_LINK_HEAD
 #: LYMessages.c:628
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
-msgstr "Envoi par méthode POST; l'élément HEAD peut être inconnu. Procéder?"
+msgstr "Envoi par méthode POST, l'élément HEAD peut être mal compris. Procéder ?"
 
 #: LYMessages.c:629
 msgid "Proceed without a username and password?"
-msgstr "Procéder sans identification de l'utilisateur et mot de passe?"
+msgstr "Procéder sans identification de l'utilisateur par mot de passe ?"
 
 #: LYMessages.c:630
 #, c-format
 msgid "Proceed (%s)?"
-msgstr "Continuer (%s)?"
+msgstr "Procéder (%s) ?"
 
 #: LYMessages.c:631
 msgid "Cannot POST to this host."
-msgstr "Impossible d'envoyer des articles vers cet hôte."
+msgstr "Impossible d'envoyer par POST vers cet hôte."
 
 # src/LYGetFile.c
 #: LYMessages.c:632
 msgid "POST not supported for this URL - ignoring POST data!"
-msgstr "Méthode POST non fonctionnelle pour cet URL; données POST ignorées"
+msgstr "Méthode POST non supportée pour cette URL - données POST ignorées."
 
 #: LYMessages.c:633
 msgid "Discarding POST data..."
-msgstr "Suppression de données POST..."
+msgstr "Suppression des données POST..."
 
 #: LYMessages.c:634
 msgid "Document will not be reloaded!"
-msgstr "Le document ne sera pas rechargé!"
+msgstr "Le document ne sera pas rechargé !"
 
 #: LYMessages.c:635
 msgid "Location: "
@@ -1956,15 +1960,15 @@ msgstr "Emplacement : "
 #: LYMessages.c:636
 #, c-format
 msgid "'%s' not found!"
-msgstr "'%s' non trouvé!"
+msgstr "'%s' non trouvé(e) !"
 
 #: LYMessages.c:637
 msgid "Default Bookmark File"
-msgstr "fichier signets implicite"
+msgstr "Fichier signets par défaut"
 
 #: LYMessages.c:638
 msgid "Screen too small! (8x35 min)"
-msgstr "L'écran est trop petit! (8x35 min)"
+msgstr "L'écran est trop petit ! (8x35 min)"
 
 #: LYMessages.c:639
 msgid "Select destination or ^G to Cancel: "
@@ -1982,7 +1986,7 @@ msgstr "Copier le L)ien dans ce fichier de signets ou C) Annuler? (l,c) : "
 
 #: LYMessages.c:644
 msgid "Multiple bookmark support is not available."
-msgstr "Le soutien des fichiers multiples n'est pas disponible."
+msgstr "Le support des signets multiples n'est pas disponible."
 
 #: LYMessages.c:645
 #, c-format
@@ -1991,19 +1995,19 @@ msgstr "Sélection de signets (écran %d de %d)"
 
 #: LYMessages.c:646
 msgid "       Select Bookmark"
-msgstr "Sélection de signets"
+msgstr "       Sélection signets"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
 #: LYMessages.c:648
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
-msgstr "Édition de la description et du chemin de fichier (%d de 2)"
+msgstr "Édition de signet : description, chemin de fichier (%d de 2)"
 
 # UNSURE
 #. #define MULTIBOOKMARKS_EHEAD
 #: LYMessages.c:650
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
-msgstr "         Édition de la description et du chemin de fichier"
+msgstr "         Édition de signet : description et chemin"
 
 # UNSURE
 #: LYMessages.c:651
@@ -2013,64 +2017,66 @@ msgstr "Lettre : "
 #. #define USE_PATH_OFF_HOME
 #: LYMessages.c:654
 msgid "Use a filepath off your login directory in SHELL syntax!"
-msgstr "Utilisez un chemin de fichier à partir de votre répertoire de connexion"
+msgstr "Utilisez un chemin de fichier hors de votre répertoire personnel (syntaxe du shell)"
 
 #: LYMessages.c:656
 msgid "Use a filepath off your home directory!"
-msgstr "Utilisez un chemin de fichier à partir de votre répertoire personnel"
+msgstr "Utilisez un chemin de fichier hors de votre répertoire personnel"
 
 #. #define MAXLINKS_REACHED
 #: LYMessages.c:659
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
-msgstr "Nombre maximum dépassé. Utilisez le défilement demi-page ou double lignes"
+msgstr "Maximum de liens/page dépassé. Utilisez le défilement demi-page ou double lignes."
 
 #: LYMessages.c:660
 msgid "No previously visited links available!"
-msgstr "Aucun lien déjà activé n'est disponible"
+msgstr "Aucun lien déjà visité n'est disponible."
 
 #: LYMessages.c:661
 msgid "Memory exhausted!  Program aborted!"
-msgstr "Mémoire insuffisante!  Abandon!"
+msgstr "Mémoire insuffisante ! Abandon !"
 
 #: LYMessages.c:662
 msgid "Memory exhausted!  Aborting..."
-msgstr "Mémoire insuffisante!  Abandon!"
+msgstr "Mémoire insuffisante ! Abandon !"
 
 #: LYMessages.c:663
 msgid "Not enough memory!"
-msgstr "Mémoire insuffisante"
+msgstr "Mémoire insuffisante !"
 
 #: LYMessages.c:664
 msgid "Directory/File Manager not available"
-msgstr "Gestionnaire de fichier/répertoire non disponible"
+msgstr "Gestionnaire de fichiers/répertoires non disponible"
 
 #: LYMessages.c:665
 msgid "HREF in BASE tag is not an absolute URL."
-msgstr "L'attribut HREF de l'élément BASE n'est pas un URL absolu"
+msgstr "L'attribut HREF de l'élément BASE n'est pas une URL absolue."
 
 #: LYMessages.c:666
 msgid "Location URL is not absolute."
-msgstr "Il ne s'agit pas d'un URL absolu"
+msgstr "Il ne s'agit pas d'une URL absolue."
 
 #: LYMessages.c:667
 msgid "Refresh URL is not absolute."
-msgstr "Il ne s'agit pas d'un URL absolu"
+msgstr "Il ne s'agit pas d'une URL absolue."
 
-# NdT: This one is not clear...   
+# NdT: This one is not clear...
 #. #define SENDING_MESSAGE_WITH_BODY_TO
 #: LYMessages.c:669
 msgid ""
 "You are sending a message with body to:\n"
 "  "
 msgstr ""
-"Vous envoyez un message à :\n"
+"Vous envoyez un message non vide à :\n"
 " "
 
 #: LYMessages.c:670
 msgid ""
 "You are sending a comment to:\n"
 "  "
-msgstr "Vous envoyez maintenant un commentaire à : "
+msgstr ""
+"Vous envoyez un commentaire à :\n"
+"  "
 
 #: LYMessages.c:671
 msgid ""
@@ -2079,8 +2085,8 @@ msgid ""
 "  "
 msgstr ""
 "\n"
-" En copie à:\n"
-" "
+" En copie à :\n"
+"  "
 
 #: LYMessages.c:672
 msgid ""
@@ -2089,8 +2095,8 @@ msgid ""
 "  "
 msgstr ""
 "\n"
-" En copies à:\n"
-" "
+" En copies à :\n"
+"  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
 #: LYMessages.c:674
@@ -2101,7 +2107,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Faites Ctrl-G pour annuler l'envoi du message\n"
+"Faites <Ctrl-G> pour annuler l'envoi du message\n"
 
 # The following two messages have been put together to make:
 #. #define ENTER_NAME_OR_BLANK
@@ -2125,7 +2131,7 @@ msgstr ""
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
 #: LYMessages.c:680
 msgid " means to contact you, if you desire a response.\n"
-msgstr " de vous joindre si vous désirez une réponse.\n"
+msgstr " moyen de vous joindre si vous désirez une réponse.\n"
 
 #: LYMessages.c:681
 msgid ""
@@ -2164,7 +2170,7 @@ msgid ""
 "Press RETURN to continue: "
 msgstr ""
 "\n"
-"Faites ENTR pour continuer :"
+"Pressez <Entrée> pour continuer :"
 
 #: LYMessages.c:687
 msgid ""
@@ -2172,11 +2178,11 @@ msgid ""
 "Press RETURN to clean up: "
 msgstr ""
 "\n"
-"Appuyez sur ENTRÉE pour restaurer : "
+"Pressez <Entrée> pour restaurer : "
 
 #: LYMessages.c:688
 msgid " Use Control-U to erase the default.\n"
-msgstr "Faites Ctrl-U pour effacer la valeur par défaut.\n"
+msgstr "Faites <Ctrl-U> pour effacer la valeur par défaut.\n"
 
 #: LYMessages.c:689
 msgid ""
@@ -2187,48 +2193,48 @@ msgstr ""
 " Veuillez entrer votre message ci-après."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
 msgstr ""
 "\n"
-" Une fois terminé, faites <Entr> et tapez un point (.)"
+" Une fois terminé, faites <Entrée> et tapez un point (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
 msgstr ""
 "\n"
-" sur une ligne, puis faites <Entr> de nouveau."
+" sur une ligne, puis faites <Entrée> de nouveau."
 
 # NOTE:  I will have to get you an example text.
 #
 #  Example:
 #    csuite.chebucto.ns.ca cookie: Status=Active+Requests  Allow? (Y/N/Always/neVer
 #   ie <host> cookie: <key>=<value> Allow?
-# Ndt: Yes! The word order might be different... 
-# NdT: Can you make the system accept the O, N, T, J commands? 
+# Ndt: Yes! The word order might be different...
+# NdT: Can you make the system accept the O, N, T, J commands?
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
 #: LYMessages.c:697
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
-msgstr "cookie de %s : %.*s=%.*s  Accepter? (O/N/Toujours/Jamais)"
+msgstr "cookie de %s : %.*s=%.*s  Accepter ? (Oui/Non/Toujours/Jamais)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
 #: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
-msgstr "Accepter un cookie au domaine non valide=%s pour '%s'?"
+msgstr "Accepter un cookie au domaine non valide=%s pour '%s' ?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
 #: LYMessages.c:701
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
-msgstr "Accepter un chemin de cookie invalide=%s comme préfixe de '%s'?"
+msgstr "Accepter un chemin de cookie invalide=%s comme préfixe de '%s' ?"
 
 #: LYMessages.c:702
 msgid "Allowing this cookie."
@@ -2240,21 +2246,20 @@ msgstr "Rejet du cookie"
 
 #: LYMessages.c:704
 msgid "The Cookie Jar is empty."
-msgstr "Le fichier des «cookies» est vide"
+msgstr "Le conteneur de «cookies» est vide"
 
 #: LYMessages.c:705
-#, fuzzy
 msgid "The Cache Jar is empty."
-msgstr "Le fichier des «cookies» est vide"
+msgstr "Le cache mémoire est vide."
 
 # --------
-# Missed strings 97-12-07 
+# Missed strings 97-12-07
 # LYMessages_en.h (LYCookie.c)
 # NdT: What do they mean by "gobble up an entire domain"?
 #. #define ACTIVATE_TO_GOBBLE
 #: LYMessages.c:707
 msgid "Activate links to gobble up cookies or entire domains,"
-msgstr "Activer les liens pour supprimer les cookies ou les domaines,"
+msgstr "Activer les liens pour englober les cookies ou les domaines entiers,"
 
 #: LYMessages.c:708
 msgid "or to change a domain's 'allow' setting."
@@ -2270,15 +2275,15 @@ msgstr "(Cookies toujours acceptés)"
 
 #: LYMessages.c:711
 msgid "(Cookies allowed via prompt.)"
-msgstr "(Cookies acceptés à l'invite)"
+msgstr "(Cookies acceptés sur demande)"
 
 #: LYMessages.c:712
 msgid "(Persistent Cookies.)"
-msgstr "(Cookies persistants.)"
+msgstr "(Cookies persistants)"
 
 #: LYMessages.c:713
 msgid "(No title.)"
-msgstr "(Pas de titre.)"
+msgstr "(Pas de titre)"
 
 #: LYMessages.c:714
 msgid "(No name.)"
@@ -2298,68 +2303,68 @@ msgstr "(Fin de session)"
 
 #: LYMessages.c:718
 msgid "Delete this cookie?"
-msgstr "Supprimer ce cookie?"
+msgstr "Supprimer ce cookie ?"
 
 #: LYMessages.c:719
 msgid "The cookie has been eaten!"
-msgstr "Le cookie a été supprimé!"
+msgstr "Le cookie a été supprimé !"
 
 #: LYMessages.c:720
 msgid "Delete this empty domain?"
-msgstr "Supprimer ce domaine vide?"
+msgstr "Supprimer ce domaine vide ?"
 
 #: LYMessages.c:721
 msgid "The domain has been eaten!"
-msgstr "Le domaine a été supprimé!"
+msgstr "Le domaine a été supprimé !"
 
-# NdT: Does P)rompt trigger a confirmation screen? 
+# NdT: Does P)rompt trigger a confirmation screen?
 #  NOTE:  Option letters come from the capitalised letter in the option,
 #      so if introducing a new option make sure it has a translation.
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
 #: LYMessages.c:723
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
-msgstr "D)Supprimer cookies; régler permission: T)oujours C)onfirmer J)amais A)nnul? "
+msgstr "D)Supprimer cookies du domaine ; régler permission : A)Toujours P)Demander V)Jamais C)Annuler ?"
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
 #: LYMessages.c:725
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
-msgstr "D)Supprimer domaine; régler permission: T)oujours C)onfirmer J)amais A)nnul? "
+msgstr "D)Supprimer domaine ; régler permission : A)Toujours P)Demander V)Jamais C)Annuler ?"
 
 #: LYMessages.c:726
 msgid "All cookies in the domain have been eaten!"
-msgstr "Tous les cookies du domaine ont été supprimés!"
+msgstr "Tous les cookies du domaine ont été supprimés !"
 
 #: LYMessages.c:727
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
-msgstr "Toujours accepter les cookies du domaine '%s'."
+msgstr "A) Toujours accepter les cookies du domaine '%s'."
 
 #: LYMessages.c:728
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
-msgstr "Ne jamais accepter les cookies du domaine '%s'."
+msgstr "V) Ne jamais accepter les cookies du domaine '%s'."
 
 # NdT: What does happen exatly when you chose P)rompt?
 #: LYMessages.c:729
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
-msgstr "Confirmer avant d'accepter les cookies du domaine '%s'."
+msgstr "P) Demander avant d'accepter les cookies du domaine '%s'."
 
 #: LYMessages.c:730
 msgid "Delete all cookies in this domain?"
-msgstr "Supprimer tous les cookies de ce domaine?"
+msgstr "Supprimer tous les cookies de ce domaine ?"
 
 #: LYMessages.c:731
 msgid "All of the cookies in the jar have been eaten!"
-msgstr "Tous les cookies ont été supprimés!"
+msgstr "Tous les cookies ont été supprimés !"
 
 #: LYMessages.c:733
 msgid "Port 19 not permitted in URLs."
-msgstr "Le port 19 n'est pas permis"
+msgstr "Le port 19 n'est pas permis dans les URL."
 
 #: LYMessages.c:734
 msgid "Port 25 not permitted in URLs."
-msgstr "Le port 25 n'est pas permis"
+msgstr "Le port 25 n'est pas permis dans les URL."
 
 #: LYMessages.c:735
 #, c-format
@@ -2368,11 +2373,11 @@ msgstr "Le port %lu n'est pas permis dans les URL."
 
 #: LYMessages.c:736
 msgid "URL has a bad port field."
-msgstr "Champ de port d'URL erroné."
+msgstr "Champ \"port\" dans l'URL erroné."
 
 #: LYMessages.c:737
 msgid "Maximum nesting of HTML elements exceeded."
-msgstr "Imbrication maximale d'éléments HTML dépassée."
+msgstr "Imbrication maximale d'éléments HTML atteinte."
 
 #: LYMessages.c:738
 msgid "Bad partial reference!  Stripping lead dots."
@@ -2380,15 +2385,15 @@ msgstr "Référence partielle erronée! Suppression des points (../)."
 
 #: LYMessages.c:739
 msgid "Trace Log open failed.  Trace off!"
-msgstr "Échec d'ouverture du journal de parcours. Annuler la commande!"
+msgstr "Échec d'ouverture du journal. Journalisation désactivée."
 
 #: LYMessages.c:740
 msgid "Lynx Trace Log"
-msgstr "Journal de parcours Lynx"
+msgstr "Journal d'activité Lynx"
 
 #: LYMessages.c:741
 msgid "No trace log has been started for this session."
-msgstr "Aucun journal de parcours n'a été lancé pour cette session."
+msgstr "Aucun journal d'activité n'a été lancé pour cette session."
 
 #. #define MAX_TEMPCOUNT_REACHED
 #: LYMessages.c:743
@@ -2398,12 +2403,12 @@ msgstr "Le nombre maximum de fichiers temporaires a été atteint."
 #. #define FORM_VALUE_TOO_LONG
 #: LYMessages.c:745
 msgid "Form field value exceeds buffer length!  Trim the tail."
-msgstr "La valeur excède la zone tampon; Élaguer les lignes finales (tail)."
+msgstr "La valeur excède la taille du tampon ; réduire la fin."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
 #: LYMessages.c:747
 msgid "Modified tail combined with head of form field value."
-msgstr "Lignes finales modifiés combinées avec en-tête (champ de formulaire)"
+msgstr "Lignes finales modifiées combinées avec entête (champ de formulaire)"
 
 #. HTFile.c
 #: LYMessages.c:750
@@ -2412,7 +2417,7 @@ msgstr "Répertoire"
 
 #: LYMessages.c:751
 msgid "Directory browsing is not allowed."
-msgstr "La lecture du répertoire n'est pas permise."
+msgstr "Le parcours du répertoire n'est pas permis."
 
 #: LYMessages.c:752
 msgid "Selective access is not enabled for this directory"
@@ -2420,7 +2425,7 @@ msgstr "L'accès sélectif n'est pas activé pour ce répertoire."
 
 #: LYMessages.c:753
 msgid "Multiformat: directory scan failed."
-msgstr "Multiformat: l'analyse du répertoire a échouée."
+msgstr "Multiformat : l'analyse du répertoire a échoué."
 
 #: LYMessages.c:754
 msgid "This directory is not readable."
@@ -2441,7 +2446,7 @@ msgstr "Impossible d'ouvrir le fichier pour décompression."
 
 #: LYMessages.c:758
 msgid "Files:"
-msgstr "Fichiers:"
+msgstr "Fichiers :"
 
 #: LYMessages.c:759
 msgid "Subdirectories:"
@@ -2462,7 +2467,7 @@ msgstr "Le répertoire courant est "
 #. HTGopher.c
 #: LYMessages.c:765
 msgid "No response from server!"
-msgstr "Pas de réponses du serveur !"
+msgstr "Pas de réponse du serveur !"
 
 #: LYMessages.c:766
 msgid "CSO index"
@@ -2474,16 +2479,16 @@ msgid ""
 "This is a searchable index of a CSO database.\n"
 msgstr ""
 "\n"
-"Ceci est un index rechercheable provenant d'une base de donnée CSO.\n"
+"Ceci est un index interrogeable d'une base de données CSO.\n"
 
 #: LYMessages.c:768
 msgid "CSO Search Results"
-msgstr "Résultat de la recherche CSO"
+msgstr "Résultats de recherche CSO"
 
 #: LYMessages.c:769
 #, c-format
 msgid "Seek fail on %s\n"
-msgstr "La recherche a échouée sur %s\n"
+msgstr "Echec de positionnement sur %s\n"
 
 #: LYMessages.c:770
 msgid ""
@@ -2491,7 +2496,7 @@ msgid ""
 "Press the 's' key and enter search keywords.\n"
 msgstr ""
 "\n"
-"Appuyez sur la touche 's' et entrez un mot clef de recherche.\n"
+"Appuyez sur la touche 's' et entrez les mots-clefs de recherche.\n"
 
 #: LYMessages.c:771
 msgid ""
@@ -2499,7 +2504,7 @@ msgid ""
 "This is a searchable Gopher index.\n"
 msgstr ""
 "\n"
-"Ceci est un index Gopher rechercheable.\n"
+"Ceci est un index Gopher interrogeable.\n"
 
 #: LYMessages.c:772
 msgid "Gopher index"
@@ -2511,7 +2516,7 @@ msgstr "Menu Gopher"
 
 #: LYMessages.c:774
 msgid " Search Results"
-msgstr " Résultats de la recherche:"
+msgstr " Résultats de la recherche"
 
 #: LYMessages.c:775
 msgid "Sending CSO/PH request."
@@ -2527,7 +2532,7 @@ msgstr "Requête CSO/PH envoyée, attente de réponse."
 
 #: LYMessages.c:778
 msgid "Gopher request sent; waiting for response."
-msgstr "Requête Gopher envoyée; attente de réponse."
+msgstr "Requête Gopher envoyée, attente de réponse."
 
 #: LYMessages.c:779
 msgid ""
@@ -2535,7 +2540,7 @@ msgid ""
 "Please enter search keywords.\n"
 msgstr ""
 "\n"
-"Merci d'entrer un mot clef pour la recherche.\n"
+"Merci d'entrer les mots clefs à rechercher.\n"
 
 #: LYMessages.c:780
 msgid ""
@@ -2543,7 +2548,7 @@ msgid ""
 "The keywords that you enter will allow you to search on a"
 msgstr ""
 "\n"
-"Le mot clef que vous entrez vous permettra de faire une recherche sur un"
+"Les mots clefs saisis vous permettront de faire une recherche sur un"
 
 #: LYMessages.c:781
 msgid " person's name in the database.\n"
@@ -2552,7 +2557,7 @@ msgstr " nom de personne dans la base de donnée.\n"
 #. HTNews.c
 #: LYMessages.c:784
 msgid "Connection closed ???"
-msgstr "Connexion terminée ???"
+msgstr "Connexion fermée ???"
 
 #: LYMessages.c:785
 msgid "Cannot open temporary file for news POST."
@@ -2576,7 +2581,7 @@ msgstr "\tAlign=%d, %d tabs. (%.0f avant, %.0f après)\n"
 #: LYMessages.c:792
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
-msgstr "\t\tTab sorte=%d à %.0f\n"
+msgstr "\t\tType Tab =%d à %.0f\n"
 
 #. HTTP.c
 #: LYMessages.c:795
@@ -2585,39 +2590,39 @@ msgstr "Impossible de procéder sans id-utilisateur et mot de passe."
 
 #: LYMessages.c:796
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
-msgstr "Impossible de réessayer sans autorisation! Contactez le Webmestre du serveur."
+msgstr "Impossible de rejouer l'autorisation ! Contactez le Webmestre du serveur."
 
 #: LYMessages.c:797
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
-msgstr "Impossible sans autorisation du mandataire; contacter le webmestre."
+msgstr "Impossible de redemander l'autorisation au mandataire (proxy) ; contacter le webmestre."
 
 #: LYMessages.c:798
 msgid "Retrying with proxy authorization information."
-msgstr "Nouvelle tentative avec info d'autorisation du mandataire"
+msgstr "Nouvelle tentative d'envoi des informations d'autorisation au mandataire (proxy)."
 
 #: LYMessages.c:799
 #, c-format
 msgid "SSL error:%s-Continue?"
-msgstr ""
+msgstr "Erreur SSL : %s - Continuer?"
 
 #. HTWAIS.c
 #: LYMessages.c:802
 msgid "HTWAIS: Return message too large."
-msgstr "HTWAIS: Message de retour trop grand."
+msgstr "HTWAIS : Message de retour trop grand."
 
 #: LYMessages.c:803
 msgid "Enter WAIS query: "
-msgstr "Entrez votre requête WAIS:"
+msgstr "Entrez votre requête WAIS :"
 
 #. Miscellaneous status
 #: LYMessages.c:806
 msgid "Retrying as HTTP0 request."
-msgstr "Nouvel essai de requête HTTP0"
+msgstr "Nouvel essai de requête HTTP0."
 
 #: LYMessages.c:807
 #, c-format
 msgid "Transferred %d bytes"
-msgstr "%d bytes transférés"
+msgstr "%d octets transférés"
 
 #: LYMessages.c:808
 msgid "Data transfer complete"
@@ -2631,7 +2636,7 @@ msgstr "Erreur à la ligne %d de %s\n"
 #. Lynx internal page titles
 #: LYMessages.c:812
 msgid "Address List Page"
-msgstr "Page de liste d'adresse"
+msgstr "Page de liste d'adresses"
 
 #: LYMessages.c:813
 msgid "Bookmark file"
@@ -2639,11 +2644,11 @@ msgstr "Fichier de signets"
 
 #: LYMessages.c:814
 msgid "Configuration Definitions"
-msgstr "Définition de la configuration"
+msgstr "Définitions de configuration"
 
 #: LYMessages.c:815
 msgid "Cookie Jar"
-msgstr "\"Le fichier des «cookies»"
+msgstr "Cache des «cookies»"
 
 #: LYMessages.c:816
 msgid "Current Key Map"
@@ -2655,24 +2660,23 @@ msgstr "Options de gestion de fichier"
 
 #: LYMessages.c:818
 msgid "Download Options"
-msgstr "Options de déchargement de fichier"
+msgstr "Options de téléchargement"
 
 #: LYMessages.c:819
 msgid "History Page"
 msgstr "Historique"
 
 #: LYMessages.c:820
-#, fuzzy
 msgid "Cache Jar"
-msgstr "\"Le fichier des «cookies»"
+msgstr "Mémoire cache"
 
 #: LYMessages.c:821
 msgid "List Page"
-msgstr "la Page de références"
+msgstr "Page de la liste"
 
 #: LYMessages.c:822
 msgid "Lynx.cfg Information"
-msgstr "Information sur Lynx.cfg"
+msgstr "Informations sur Lynx.cfg"
 
 #: LYMessages.c:823
 msgid "Converted Mosaic Hotlist"
@@ -2680,11 +2684,11 @@ msgstr "Liste de signets Mosaic convertie"
 
 #: LYMessages.c:824
 msgid "Options Menu"
-msgstr "Menu des paramètres"
+msgstr "Menu Options"
 
 #: LYMessages.c:825
 msgid "File Permission Options"
-msgstr "Options de permission d'accès"
+msgstr "Options de permissions d'accès"
 
 #: LYMessages.c:826
 msgid "Printing Options"
@@ -2692,19 +2696,19 @@ msgstr "Options d'impression"
 
 #: LYMessages.c:827
 msgid "Information about the current document"
-msgstr "Information sur le document courant"
+msgstr "Informations sur le document courant"
 
 #: LYMessages.c:828
 msgid "Your recent statusline messages"
-msgstr "Votre ligne d'état récente"
+msgstr "Votre ligne d'état de messages récente"
 
 #: LYMessages.c:829
 msgid "Upload Options"
-msgstr "Options de chargement de fichier "
+msgstr "Options d'envoi de fichiers"
 
 #: LYMessages.c:830
 msgid "Visited Links Page"
-msgstr "la Page des liens activés"
+msgstr "Page des liens visités"
 
 #. CONFIG_DEF_TITLE subtitles
 #: LYMessages.c:833
@@ -2724,9 +2728,8 @@ msgid "compile time options"
 msgstr "options de compilation"
 
 #: LYMessages.c:837
-#, fuzzy
 msgid "color-style configuration"
-msgstr "Votre configuration principale"
+msgstr "configuration en style coloré"
 
 #: LYMessages.c:838
 msgid "latest release"
@@ -2747,8 +2750,8 @@ msgid ""
 "process of this copy of Lynx.  When reporting a bug, please include a copy\n"
 "of this page."
 msgstr ""
-"Les données suivantes ont été es déduites lors de la configuration automatique\n"
-"de cette copie de lynx. Lorsque vous nous informer d'un bug, merci \n"
+"Les données suivantes ont été créées lors de la construction automatique\n"
+"de cette copie de lynx. Lorsque vous nous informez d'un bug, merci \n"
 "d'inclure une copie de cette page."
 
 #. #define AUTOCONF_LYNXCFG_H
@@ -2757,88 +2760,83 @@ msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
 msgstr ""
-"Les données suivantes ont été es utilisées comme des options de compilations\n"
+"Les données suivantes ont été utilisées comme des options de compilations\n"
 "configurées automatiquement lors de la compilation de cette version de Lynx."
 
 #. #define DIRED_NOVICELINE
 #: LYMessages.c:851
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
-msgstr "C)réer D)écharger E)diter F) Menu M)odifier R) Supprimer T) Marquer U) Charger\n"
+msgstr "C)réer D)télécharger E)diter F)Menu  M)odifier R)Supprimer T)Marquer U)Envoyer\n"
 
 #: LYMessages.c:852
 msgid "Failed to obtain status of current link!"
-msgstr "Impossible d'obtenir l'état du lien actif!"
+msgstr "Impossible d'obtenir l'état du lien courant !"
 
 #. #define INVALID_PERMIT_URL
 #: LYMessages.c:855
 msgid "Special URL only valid from current File Permission menu!"
-msgstr "URL spécial valide uniquement depuis le menu de permission d'accès actif"
+msgstr "URL spéciales validées uniquement dans le menu \"permissions\" !"
 
 #: LYMessages.c:859
 msgid "External support is currently disabled."
-msgstr "Le soutien externe est présentement inactive."
+msgstr "Le support externe est présentement inactif."
 
 #. new with 2.8.4dev.21
 #: LYMessages.c:863
-#, fuzzy
 msgid "Changing working-directory is currently disabled."
-msgstr "Le lancement est présentement désactivé."
+msgstr "Le changement de répertoire de travail est désactivé."
 
 #: LYMessages.c:864
-#, fuzzy
 msgid "Linewrap OFF!"
-msgstr "Traçage DÉSACTIVÉ"
+msgstr "Coupure des lignes désactivée"
 
 #: LYMessages.c:865
 msgid "Linewrap ON!"
-msgstr ""
+msgstr "Coupure des lignes activée"
 
 #: LYMessages.c:866
-#, fuzzy
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
-msgstr "Le mode 8-bits ou CJK est réglé à DÉSACTIVÉ! Chargement..."
+msgstr "Analyse des tables imbriquées activée. Rechargement..."
 
 #: LYMessages.c:867
-#, fuzzy
 msgid "Parsing nested-tables toggled ON!  Reloading..."
-msgstr "Le mode 8-bits ou CJK est réglé à ACTIVÉ! Chargement..."
+msgstr "Analyse des tables imbriquées désactivée. Rechargement..."
 
 #: LYMessages.c:868
 msgid "Shifting is disabled while line-wrap is in effect"
-msgstr ""
+msgstr "Glissement de ligne désactivé (coupures de lignes activées)"
 
 #: LYMessages.c:869
-#, fuzzy
 msgid "Trace not supported"
-msgstr "Le terminal ne permet pas l'affichage couleur"
+msgstr "Traçage non supporté"
 
 #: LYMessages.c:790
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
-msgstr "\tIndentations: premiere=%.0f autres=%.0f, Hauteur=%.1f Desc=%.1f\n"
+msgstr "\tIndentations : première=%.0f autres=%.0f, hauteur=%.1f desc=%.1f\n"
 
 #: WWW/Library/Implementation/HTAABrow.c:626
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
-msgstr "TR-Username for '%s' at %s '%s%s':"
+msgstr "Nom d'utilisateur pour '%s' à %s '%s%s':"
 
 #: WWW/Library/Implementation/HTAABrow.c:894
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
-msgstr "Ce client ne sait pas comment composer l'information d'autorisation du mandataire pour le schème d'adressage"
+msgstr "Ce client ne sait pas former les données d'autorisation du mandataire (proxy) dans ce schéma"
 
 #: WWW/Library/Implementation/HTAABrow.c:971
 msgid "This client doesn't know how to compose authorization information for scheme"
-msgstr "Ce client ne sait pas comment composer des informations d'autorisation pour un schéma"
+msgstr "Ce client ne sait pas former les données d'autorisation (proxy) pour le schéma"
 
 #: WWW/Library/Implementation/HTAABrow.c:1079
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
-msgstr "Header invalide '%s%s%s%s%s'"
+msgstr "Entête invalide '%s%s%s%s%s'"
 
 # WWW/Libary/Implementation/HTAABrow.c
 #: WWW/Library/Implementation/HTAABrow.c:1181
 msgid "Proxy authorization required -- retrying"
-msgstr "Autorisation du mandataire requise - nouvelle tentative"
+msgstr "Autorisation du mandataire (proxy) requise - nouvelle tentative"
 
 #: WWW/Library/Implementation/HTAABrow.c:1239
 msgid "Access without authorization denied -- retrying"
@@ -2851,36 +2849,36 @@ msgstr "Accès interdit par une règle"
 # WWW/Libary/Implementation/HTAccess.c
 #: WWW/Library/Implementation/HTAccess.c:783
 msgid "Document with POST content not found in cache.  Resubmit?"
-msgstr "Document avec contenu POST non trouvé dans l'antémémoire. Recommencer?"
+msgstr "Document avec contenu POST non trouvé dans l'antémémoire. Réessayer ?"
 
 #: WWW/Library/Implementation/HTAccess.c:938
 msgid "Loading failed, use a previous copy."
-msgstr ""
+msgstr "Echec de chargement, utilisation d'une copie précédente."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Chargement incomplet."
 
 #: WWW/Library/Implementation/HTAccess.c:1078
 #, c-format
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
-msgstr "**** HTAccess: socket ou numéro de fichier renvoyé par une routine de chargement obsolète!\n"
+msgstr "**** HTAccess : socket ou numéro de fichier renvoyé par une routine de chargement obsolète !\n"
 
 #: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@nongnu.org!\n"
-msgstr "**** HTAccess: Erreur interne. Merci de contacter lynx-dev@nongnu.org !\n"
+msgstr "**** HTAccess : Erreur interne. Merci de contacter lynx-dev@nongnu.org !\n"
 
 #: WWW/Library/Implementation/HTAccess.c:1081
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
-msgstr "**** HTAccess: L'état retourné était: %d\n"
+msgstr "**** HTAccess : L'état retourné était : %d\n"
 
 #.
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Accès impossible"
 
@@ -2891,19 +2889,19 @@ msgstr "Impossible d'accéder au document."
 #: WWW/Library/Implementation/HTFTP.c:843
 #, c-format
 msgid "Enter password for user %s@%s:"
-msgstr "Mot de passe pour l'utilisateur %s@%s:"
+msgstr "Mot de passe pour l'utilisateur %s@%s :"
 
 #: WWW/Library/Implementation/HTFTP.c:871
 msgid "Unable to connect to FTP host."
-msgstr "Impossible d'établir une connexion à l'hôte FTP"
+msgstr "Impossible d'établir une connexion à l'hôte FTP."
 
 #: WWW/Library/Implementation/HTFTP.c:1152
 msgid "close master socket"
-msgstr "fermer le socket maître"
+msgstr "ferme le socket maître"
 
 #: WWW/Library/Implementation/HTFTP.c:1214
 msgid "socket for master socket"
-msgstr "socket pour le socket maître"
+msgstr "slot pour le socket maître"
 
 #.
 #. * It's a symbolic link, does the user care about knowing if it is
@@ -2920,35 +2918,35 @@ msgstr "Réception du répertoire FTP."
 #: WWW/Library/Implementation/HTFTP.c:2843
 #, c-format
 msgid "Transferred %d bytes (%5d)"
-msgstr "%d bytes téléchargées (%5d)"
+msgstr "%d octets transférés (%5d)"
 
 #: WWW/Library/Implementation/HTFTP.c:3194
 msgid "connect for data"
-msgstr "connection pour données"
+msgstr "connection d'échange de données"
 
 #: WWW/Library/Implementation/HTFTP.c:3855
 msgid "Receiving FTP file."
-msgstr "Réception du fichier FTP"
+msgstr "Réception du fichier FTP."
 
 #: WWW/Library/Implementation/HTFinger.c:273
 msgid "Could not set up finger connection."
-msgstr "Impossible d'établir une connection finger"
+msgstr "Impossible d'établir une connection finger."
 
 #: WWW/Library/Implementation/HTFinger.c:320
 msgid "Could not load data (no sitename in finger URL)"
-msgstr "Impossible de lire les données (pas de nom de site pour l'URL)"
+msgstr "Impossible de lire les données (pas de nom de site dans l'URL finger)"
 
 #: WWW/Library/Implementation/HTFinger.c:326
 msgid "Invalid port number - will only use port 79!"
-msgstr "Numéro de port invalide - seul le port 79 sera utilisé"
+msgstr "Numéro de port invalide - seul le port 79 sera utilisé."
 
 #: WWW/Library/Implementation/HTFinger.c:392
 msgid "Could not access finger host."
-msgstr "Impossible d'atteindre l'hôte"
+msgstr "Impossible d'atteindre l'hôte finger."
 
 #: WWW/Library/Implementation/HTFinger.c:400
 msgid "No response from finger server."
-msgstr "Pas de réponses du serveur finger"
+msgstr "Pas de réponses du serveur finger."
 
 #: WWW/Library/Implementation/HTNews.c:426
 #, c-format
@@ -2957,11 +2955,11 @@ msgstr "Nom d'utilisateur pour l'hôte de forums '%s' :"
 
 #: WWW/Library/Implementation/HTNews.c:479
 msgid "Change username?"
-msgstr "Modifier le nom d'utilisateur?"
+msgstr "Modifier le nom d'utilisateur ?"
 
 #: WWW/Library/Implementation/HTNews.c:483
 msgid "Username:"
-msgstr "Nom d'utilisateur:"
+msgstr "Nom d'utilisateur :"
 
 #: WWW/Library/Implementation/HTNews.c:508
 #, c-format
@@ -2970,18 +2968,20 @@ msgstr "Mot de passe pour l'hôte de forums '%s' :"
 
 #: WWW/Library/Implementation/HTNews.c:591
 msgid "Change password?"
-msgstr "Changer le mot de passe?"
+msgstr "Changer le mot de passe ?"
 
 #: WWW/Library/Implementation/HTNews.c:1711
 #, c-format
 msgid "No matches for: %s"
-msgstr "Pas de correspondances pour: %s"
+msgstr "Pas de correspondance pour %s"
 
 #: WWW/Library/Implementation/HTNews.c:1761
 msgid ""
 "\n"
 "No articles in this group.\n"
 msgstr ""
+"\n"
+"Par d'article dans ce groupe.\n"
 
 #: WWW/Library/Implementation/HTNews.c:1773
 msgid ""
@@ -2989,7 +2989,7 @@ msgid ""
 "No articles in this range.\n"
 msgstr ""
 "\n"
-"Pas d'articles dans cet intervale.\n"
+"Pas d'article dans cet intervalle.\n"
 
 #.
 #. * Set window title.
@@ -2997,7 +2997,7 @@ msgstr ""
 #: WWW/Library/Implementation/HTNews.c:1786
 #, c-format
 msgid "%s,  Articles %d-%d"
-msgstr ""
+msgstr "%s,  Articles %d-%d"
 
 #: WWW/Library/Implementation/HTNews.c:1809
 msgid "Earlier articles"
@@ -3011,7 +3011,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Il y a à jusqu'à %d articles accessibles dans %s, les ID suivent:\n"
+"Il y a environ %d articles accessibles dans %s, les ID suivent :\n"
 "\n"
 
 #: WWW/Library/Implementation/HTNews.c:1884
@@ -3020,7 +3020,7 @@ msgstr "Tout les articles accessibles dans "
 
 #: WWW/Library/Implementation/HTNews.c:2098
 msgid "Later articles"
-msgstr "Articles plus récents"
+msgstr "Articles récents"
 
 #: WWW/Library/Implementation/HTNews.c:2121
 msgid "Post to "
@@ -3032,11 +3032,11 @@ msgstr "Ce client ne supporte pas les URLs SNEWS"
 
 #: WWW/Library/Implementation/HTNews.c:2550
 msgid "No target for raw text!"
-msgstr "Aucune cible pour le texte brut!"
+msgstr "Aucune cible pour du texte brut !"
 
 #: WWW/Library/Implementation/HTNews.c:2581
 msgid "Connecting to NewsHost ..."
-msgstr "Connection à l'hôte de nouvelles ...."
+msgstr "Connection à l'hôte de forums..."
 
 #: WWW/Library/Implementation/HTNews.c:2633
 #, c-format
@@ -3046,7 +3046,7 @@ msgstr "Impossible d'accéder à %s."
 #: WWW/Library/Implementation/HTNews.c:2739
 #, 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épondu: %.200s"
+msgstr "Impossible de lire les informations. Le serveur de nouvelles %.20s à répondu : %.200s"
 
 #: WWW/Library/Implementation/HTNews.c:2743
 #, c-format
@@ -3073,17 +3073,17 @@ msgstr "Lecture d'articles de forums."
 
 #: WWW/Library/Implementation/HTNews.c:3004
 msgid "Sorry, could not load requested news."
-msgstr "Désolé, impossible de charger la nouvelles demandée."
+msgstr "Désolé, impossible de charger les nouvelles demandées."
 
 #: WWW/Library/Implementation/HTTCP.c:1282
 msgid "Address has invalid port"
-msgstr "L'adresse a un numéro de port invalide"
+msgstr "L'adresse a un numéro de port non valide"
 
 #: WWW/Library/Implementation/HTTCP.c:1358
 msgid "Address length looks invalid"
 msgstr "La longueur de l'adresse semble invalide"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Impossible de localiser l'hôte distant %s"
@@ -3092,138 +3092,137 @@ msgstr "Impossible de localiser l'hôte distant %s"
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
-msgstr "Nom d'hôte invalide: %s"
+msgstr "Nom d'hôte invalide : %s"
 
 # First %s will be FTP, HTTP or other protocol and second %s will be hostname
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Connexion %s à %s "
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
-msgstr "la socket a échouée"
+msgstr "échec de socket."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
-msgstr "La socket a échouée: famille %d adresse %s port %s."
+msgstr "échec de socket : famille %d adresse %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
-msgstr "Impossible d'établir une connection non bloquante"
+msgstr "Impossible d'établir une connection non bloquante."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
-msgstr "Connection impossible (trop d'essais successifs)"
+msgstr "Echec de connection (trop d'essais successifs)"
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
-msgstr "Impossible de rétablir le blocage sur la socket"
+msgstr "Impossible de rétablir le mode bloquant sur le slot."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "La lecture de la socket a échouée pour 180,000 essais"
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Echec de connection (trop d'essais successifs)"
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
-msgstr ""
+msgstr "retour d'appel SSL : %s, preverify_ok=%d, ssl_okay=%d"
 
 #: WWW/Library/Implementation/HTTP.c:406
 #, c-format
 msgid "Address contains a username: %s"
-msgstr ""
+msgstr "L'adresse contient un nom d'utilisateur : %s"
 
 #: WWW/Library/Implementation/HTTP.c:460
 #, c-format
 msgid "Certificate issued by: %s"
-msgstr ""
+msgstr "Certificat émis par: %s"
 
 #: WWW/Library/Implementation/HTTP.c:620
 msgid "This client does not contain support for HTTPS URLs."
-msgstr "Ce client n'est pas conçu pour traiter les URL HTTPS"
+msgstr "Ce client n'est pas conçu pour traiter les URL HTTPS."
 
 #: WWW/Library/Implementation/HTTP.c:645
 msgid "Unable to connect to remote host."
-msgstr "Impossible d'établir une connexion à l'hôte distant"
+msgstr "Impossible d'établir une connexion à l'hôte distant."
 
 # First %s will be FTP, HTTP or other protocol and second %s will be hostname
 #: WWW/Library/Implementation/HTTP.c:669
-#, fuzzy
 msgid "Retrying connection without TLS."
-msgstr "Connexion %s à %s "
+msgstr "Tentative de reconnection sans TLS."
 
 #: WWW/Library/Implementation/HTTP.c:714
 msgid "no issuer was found"
-msgstr ""
+msgstr "l'émetteur n'a pas été trouvé"
 
 #: WWW/Library/Implementation/HTTP.c:716
 msgid "issuer is not a CA"
-msgstr ""
+msgstr "l'émetteur n'est pas une autorité CA"
 
 #: WWW/Library/Implementation/HTTP.c:718
 msgid "the certificate has no known issuer"
-msgstr ""
+msgstr "le certificat n'a pas d'émetteur connu"
 
 #: WWW/Library/Implementation/HTTP.c:720
-#, fuzzy
 msgid "the certificate has been revoked"
-msgstr "Le cookie a été supprimé!"
+msgstr "le certificat a été révoqué"
 
 #: WWW/Library/Implementation/HTTP.c:722
 msgid "the certificate is not trusted"
-msgstr ""
+msgstr "le certificat n'est pas approuvé"
 
 #: WWW/Library/Implementation/HTTP.c:807
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
-msgstr ""
+msgstr "Connection vérifiée à %s (cert=%s)"
 
 #: WWW/Library/Implementation/HTTP.c:855 WWW/Library/Implementation/HTTP.c:901
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
-msgstr ""
+msgstr "Connection vérifiée à %s (sujet=%s)"
 
 #: WWW/Library/Implementation/HTTP.c:931
 msgid "Can't find common name in certificate"
-msgstr ""
+msgstr "Impossible de trouver le nom usuel dans le certificat"
 
 #: WWW/Library/Implementation/HTTP.c:934
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
-msgstr ""
+msgstr "erreur SSL : hôte (%s) <> cert(%s) - Continuer ?"
 
 #: WWW/Library/Implementation/HTTP.c:947
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
-msgstr ""
+msgstr "Connection NON vérifiée à %s (cert=%s)"
 
 #: WWW/Library/Implementation/HTTP.c:956
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
-msgstr ""
+msgstr "Connection HTTP sécurisée %d-bit %s (%s)"
 
 #: WWW/Library/Implementation/HTTP.c:1426
 msgid "Sending HTTP request."
-msgstr "Envoi de la requête HTTP"
+msgstr "Envoi de la requête HTTP."
 
 #: WWW/Library/Implementation/HTTP.c:1465
 msgid "Unexpected network write error; connection aborted."
-msgstr "Erreur d'écriture réseau inattendue: connection annulée."
+msgstr "Erreur d'écriture réseau inattendue : connection interrompue."
 
 #: WWW/Library/Implementation/HTTP.c:1471
 msgid "HTTP request sent; waiting for response."
-msgstr "Demande acheminée au serveur. Veuillez attendre"
+msgstr "Requête HTTP envoyée. Attente de réponse."
 
 # END of Permit FORM
 # More progress strings follow
 #: WWW/Library/Implementation/HTTP.c:1539
 msgid "Unexpected network read error; connection aborted."
-msgstr "Erreur de lecture inattendue; connexion interrompue"
+msgstr "Erreur de lecture inattendue ; connexion interrompue."
 
 #.
 #. * HTTP/1.1 Informational statuses.
@@ -3236,7 +3235,7 @@ msgstr "Erreur de lecture inattendue; connexion interrompue"
 #.
 #: WWW/Library/Implementation/HTTP.c:1733
 msgid "Got unexpected Informational Status."
-msgstr "Réception d'information de statut inattendue"
+msgstr "Réception d'information de statut inattendue."
 
 #.
 #. * Reset Content.  The server has fulfilled the request but
@@ -3246,7 +3245,7 @@ msgstr "Réception d'information de statut inattendue"
 #.
 #: WWW/Library/Implementation/HTTP.c:1767
 msgid "Request fulfilled.  Reset Content."
-msgstr "Requête fructueuse. Restauration du contenu."
+msgstr "Requête complétée. Restauration du contenu."
 
 #. Not Modified
 #.
@@ -3256,11 +3255,11 @@ msgstr "Requête fructueuse. Restauration du contenu."
 #.
 #: WWW/Library/Implementation/HTTP.c:1884
 msgid "Got unexpected 304 Not Modified status."
-msgstr "Réception inattendue d'un état non modifié 304"
+msgstr "Réception inattendue d'un état \"non modifié\" 304."
 
 #: WWW/Library/Implementation/HTTP.c:1947
 msgid "Redirection of POST content requires user approval."
-msgstr "La redirection d'un contenu POST nécessite l'accord de l'utilisateur"
+msgstr "La redirection d'un contenu POST nécessite l'accord de l'utilisateur."
 
 #: WWW/Library/Implementation/HTTP.c:1962
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
@@ -3268,7 +3267,7 @@ msgstr "Contenu POST. La redirection permanente est traitée comme temporaire.\n"
 
 #: WWW/Library/Implementation/HTTP.c:2004
 msgid "Retrying with access authorization information."
-msgstr "Nouvel essai avec information d'autorisation d'accès"
+msgstr "Nouvel essai avec information d'autorisation d'accès."
 
 #: WWW/Library/Implementation/HTTP.c:2016
 msgid "Show the 401 message body?"
@@ -3276,7 +3275,7 @@ msgstr "Visualiser le corps du message 401 ?"
 
 #: WWW/Library/Implementation/HTTP.c:2059
 msgid "Show the 407 message body?"
-msgstr "Afficher le corps du message 407?"
+msgstr "Afficher le corps du message 407 ?"
 
 #.
 #. * Bad or unknown server_status number.  Take a chance and hope
@@ -3284,24 +3283,24 @@ msgstr "Afficher le corps du message 407?"
 #.
 #: WWW/Library/Implementation/HTTP.c:2159
 msgid "Unknown status reply from server!"
-msgstr "Réponse d'état inconnue reçue du serveur"
+msgstr "Réponse d'état inconnue reçue du serveur !"
 
 #: WWW/Library/Implementation/HTTelnet.c:113
 #, c-format
 msgid "remote %s session:"
-msgstr "session distante %s"
+msgstr "session distante %s :"
 
 #: WWW/Library/Implementation/HTWAIS.c:162
 msgid "Could not connect to WAIS server."
-msgstr "Connection au serveur WAIS impossible"
+msgstr "Connection au serveur WAIS impossible."
 
 #: WWW/Library/Implementation/HTWAIS.c:170
 msgid "Could not open WAIS connection for reading."
-msgstr "Impossible d'ouvrir une connection WAIS en lecture"
+msgstr "Impossible d'ouvrir une connection WAIS en lecture."
 
 #: WWW/Library/Implementation/HTWAIS.c:192
 msgid "Diagnostic code is "
-msgstr "Le code de diagnostique est "
+msgstr "Le code de diagnostic est "
 
 #: WWW/Library/Implementation/HTWAIS.c:464
 msgid "Index "
@@ -3314,11 +3313,11 @@ msgstr " contient les %d éléments suivants %s relatifs à \""
 
 #: WWW/Library/Implementation/HTWAIS.c:476
 msgid "The first figure after each entry is its relative score, "
-msgstr "La première illustration après chaque entrée est sont score relatif"
+msgstr "La première mention après chaque entrée est son score relatif"
 
 #: WWW/Library/Implementation/HTWAIS.c:477
 msgid "the second is the number of lines in the item."
-msgstr "Le second est le nombre de ligne dans l'élément."
+msgstr "la seconde est le nombre de ligne dans l'élément."
 
 #: WWW/Library/Implementation/HTWAIS.c:519
 msgid " (bad file name)"
@@ -3330,7 +3329,7 @@ msgstr "(mauvais id de doc)"
 
 #: WWW/Library/Implementation/HTWAIS.c:561
 msgid "(Short Header record, can't display)"
-msgstr "(Court enregistrement de Heade, impossible d'afficher)"
+msgstr "(enr. d'entête abrégé, impossible d'afficher)"
 
 #: WWW/Library/Implementation/HTWAIS.c:568
 msgid ""
@@ -3338,7 +3337,7 @@ msgid ""
 "Long Header record, can't display\n"
 msgstr ""
 "\n"
-"Long enregistrement de Header, impossible d'afficher\n"
+"enr. d'entête long, impossible d'afficher\n"
 
 #: WWW/Library/Implementation/HTWAIS.c:575
 msgid ""
@@ -3353,12 +3352,16 @@ msgid ""
 "\n"
 "Headline record, can't display\n"
 msgstr ""
+"\n"
+"Enregistrement d'entête, affichage impossible\n"
 
 #: WWW/Library/Implementation/HTWAIS.c:592
 msgid ""
 "\n"
 "Code record, can't display\n"
 msgstr ""
+"\n"
+"Enregistrement du code, affichage impossible\n"
 
 #: WWW/Library/Implementation/HTWAIS.c:696
 msgid "Syntax error in WAIS URL"
@@ -3370,11 +3373,11 @@ msgstr " (Index WAIS) "
 
 #: WWW/Library/Implementation/HTWAIS.c:775
 msgid "WAIS Index: "
-msgstr "Index WAIS: "
+msgstr "Index WAIS : "
 
 #: WWW/Library/Implementation/HTWAIS.c:781
 msgid "This is a link for searching the "
-msgstr "Ceci est un lien pour chercher le "
+msgstr "Ceci est un lien pour chercher l' "
 
 #: WWW/Library/Implementation/HTWAIS.c:785
 msgid " WAIS Index.\n"
@@ -3386,7 +3389,7 @@ msgid ""
 "Enter the 's'earch command and then specify search words.\n"
 msgstr ""
 "\n"
-"Entrez la commande de recherche (s) puis les mots de recherche.\n"
+"Entrez la commande de recherche (s) puis les mots à rechercher.\n"
 
 #: WWW/Library/Implementation/HTWAIS.c:836
 msgid " (in "
@@ -3402,7 +3405,7 @@ msgstr "\" dans: "
 
 #: WWW/Library/Implementation/HTWAIS.c:864
 msgid "HTWAIS: Request too large."
-msgstr "HTWAIS: requête trop grande."
+msgstr "HTWAIS : requête trop grande."
 
 #: WWW/Library/Implementation/HTWAIS.c:873
 msgid "Searching WAIS database..."
@@ -3418,7 +3421,7 @@ msgstr "Impossible de convertir le format du document WAIS"
 
 #: WWW/Library/Implementation/HTWAIS.c:978
 msgid "HTWAIS: Request too long."
-msgstr "HTWAIS: requête trop longue."
+msgstr "HTWAIS : requête trop longue."
 
 #.
 #. * Actually do the transaction given by request_message.
@@ -3431,11 +3434,11 @@ msgstr "Rapatriement du document WAIS...."
 #. wais_database, keywords);
 #: WWW/Library/Implementation/HTWAIS.c:1031
 msgid "No text was returned!\n"
-msgstr "Aucun texte n'a été retourné!\n"
+msgstr "Aucun texte n'a été retourné !\n"
 
 #: WWW/Library/Implementation/HTWSRC.c:296
 msgid " NOT GIVEN in source file; "
-msgstr "PAS DONNE dans le fichier source;"
+msgstr "NON donné dans le fichier source ;"
 
 #: WWW/Library/Implementation/HTWSRC.c:319
 msgid " WAIS source file"
@@ -3456,7 +3459,7 @@ msgstr "Accès direct"
 #. * Proxy will be used if defined, so let user know that - FM *
 #: WWW/Library/Implementation/HTWSRC.c:360
 msgid " (or via proxy server, if defined)"
-msgstr " (ou via un serveur de procuration, si défini)"
+msgstr " (ou via un serveur mandataire proxy, si défini)"
 
 #: WWW/Library/Implementation/HTWSRC.c:375
 msgid "Maintainer"
@@ -3469,7 +3472,7 @@ msgstr "Hôte"
 # src/GridText.c
 #: src/GridText.c:705
 msgid "Memory exhausted, display interrupted!"
-msgstr "Mémoire insuffisante; interruption de l'affichage."
+msgstr "Mémoire insuffisante ; interruption de l'affichage."
 
 #: src/GridText.c:710
 msgid "Memory exhausted, will interrupt transfer!"
@@ -3485,7 +3488,7 @@ msgstr "champ ou lien inconnu"
 
 #: src/GridText.c:6105
 msgid "text entry field"
-msgstr "champ de saisie de texte"
+msgstr "champ de saisie texte"
 
 #: src/GridText.c:6108
 msgid "password entry field"
@@ -3493,7 +3496,7 @@ msgstr "champ d'entrée du mot de passe"
 
 #: src/GridText.c:6111
 msgid "checkbox"
-msgstr "case d'option"
+msgstr "case à cocher"
 
 #: src/GridText.c:6114
 msgid "radio button"
@@ -3505,11 +3508,11 @@ msgstr "bouton Envoyer"
 
 #: src/GridText.c:6120
 msgid "reset button"
-msgstr "bouton Effacer"
+msgstr "bouton RAZ"
 
 #: src/GridText.c:6123
 msgid "popup menu"
-msgstr "menu éclair"
+msgstr "menu popup"
 
 #: src/GridText.c:6126
 msgid "hidden form field"
@@ -3517,15 +3520,15 @@ msgstr "champ de formulaire caché"
 
 #: src/GridText.c:6129
 msgid "text entry area"
-msgstr "zone d'entrée de texte"
+msgstr "zone saisie de texte"
 
 #: src/GridText.c:6132
 msgid "range entry field"
-msgstr "champ de saisie (range)"
+msgstr "champ de saisie (intervalle)"
 
 #: src/GridText.c:6135
 msgid "file entry field"
-msgstr "champ de saisie (file)"
+msgstr "champ de saisie (fichier)"
 
 #: src/GridText.c:6138
 msgid "text-submit field"
@@ -3544,37 +3547,36 @@ msgid "unknown form field"
 msgstr "champ de formulaire inconnu"
 
 # WWW/Libary/Implementation/HTFile.c
-#: src/GridText.c:10320
-#, fuzzy
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
-msgstr "Impossible d'ouvrir le fichier pour décompression."
+msgstr "Impossible d'ouvrir le fichier pour envoi."
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Envoi de %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
-msgstr ""
+msgstr "Problème détecté : structure TextAnchor corrompue - abandon suggéré !"
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
-msgstr "Raccourcir les lignes pour correspondre à la zone d'affichage ?"
+msgstr "Couper les lignes pour remplir la zone d'affichage ?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
-msgstr "Les très longues lignes ont été es tassées"
+msgstr "Les très longues lignes ont été coupées !"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
-msgstr "Les très longues lignes ont été es tronquées"
+msgstr "Les très longues lignes ont été tronquées !"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
-msgstr "bytes"
+msgstr "octets"
 
 # WWW/Library/Implementation/HTFormat.c
 #.
@@ -3584,12 +3586,12 @@ msgstr "bytes"
 #: src/HTAlert.c:300 src/HTAlert.c:324
 #, c-format
 msgid "Read %s of data"
-msgstr "Lecture de %s kilo octets de données"
+msgstr "Données lues : %s"
 
 #: src/HTAlert.c:321
 #, c-format
 msgid "Read %s of %s of data"
-msgstr "Lecture de %s de %s octets de données"
+msgstr "Données lues : %s de %s"
 
 #: src/HTAlert.c:330
 #, c-format
@@ -3597,23 +3599,23 @@ msgid ", %s/sec"
 msgstr ", %s/sec"
 
 #: src/HTAlert.c:342
-#, fuzzy, c-format
+#, c-format
 msgid " (stalled for %s)"
-msgstr " (bloqué pour %ld sec)"
+msgstr " (bloqué pour %s)"
 
 #: src/HTAlert.c:346
-#, fuzzy, c-format
+#, c-format
 msgid ", ETA %s"
-msgstr ", temps estimé: %ld sec"
+msgstr ", temps estimé ETA : %s"
 
 #: src/HTAlert.c:368
 msgid " (Press 'z' to abort)"
-msgstr " (Appuyer sur 'z' pour annuler.)"
+msgstr " (Pressez 'z' pour annuler)"
 
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# The French translations for Lynx were created by the 
+# The French translations for Lynx were created by the
 # Chebucto Project.
 # Contributors include:
 # Chris Maxwell (CM)
@@ -3676,7 +3678,7 @@ msgstr "non"
 #.
 #: src/HTAlert.c:911
 msgid "Y/N/A/V"
-msgstr ""
+msgstr "O/N/T/J"
 
 #: src/HTML.c:5911
 msgid "Description:"
@@ -3696,7 +3698,7 @@ msgstr "(inconnu)"
 
 #: src/HTML.c:7353
 msgid "Document has only hidden links.  Use the 'l'ist command."
-msgstr "Le document ne contient que des liens cachés. Utiliser L) Références."
+msgstr "Le document ne contient que des liens cachés. Utiliser L)iste."
 
 #: src/HTML.c:7852
 msgid "Source cache error - disk full?"
@@ -3704,7 +3706,7 @@ msgstr "Erreur de cache - disque plein ?"
 
 #: src/HTML.c:7865
 msgid "Source cache error - not enough memory!"
-msgstr "Erreur de cache - pas assez de mémoire"
+msgstr "Erreur de cache - pas assez de mémoire !"
 
 #: src/LYBookmark.c:164
 msgid ""
@@ -3724,7 +3726,7 @@ msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
 msgstr ""
-"     Vous pouvez effacer des lines par la touche 'R'<br>\n"
+"     Vous pouvez effacer des liens avec la touche 'R'<br>\n"
 "<ol>\n"
 
 #: src/LYBookmark.c:374
@@ -3743,8 +3745,7 @@ msgid ""
 "     outdated or invalid links, or to change their order."
 msgstr ""
 "     Le fichier peut aussi être édité au moyen d'un éditeur de texte standard.\n"
-"     Vous pouvez supprimer les liens désuets ou non valides ou en modifier\n"
-"     l'ordre."
+"     Vous pouvez supprimer les liens désuets/non valides ou modifier l'ordre."
 
 #: src/LYBookmark.c:381
 msgid ""
@@ -3753,54 +3754,56 @@ msgid ""
 "      or add other HTML markup.\n"
 "      Make sure any bookmark link is saved as a single line."
 msgstr ""
-"     Mais vous ne devez pas changer le format à l'intérieur des lignes\n"
-"     ni ajouter d'autres balises HTML."
+"Note: si vous éditez ce fichier, ne changez\n"
+"      pas la structure des lignes et n'\n"
+"      ajoutez pas de balise HTML.\n"
+"      Soyez sûr que chaque signet est sur une seule ligne."
 
 #: src/LYBookmark.c:677
 #, c-format
 msgid "File may be recoverable from %s during this session"
-msgstr "Le fichier pourrait être récupérable de %s lors de cette session"
+msgstr "Le fichier pourrait être récupérable depuis %s lors de cette session"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
-msgstr ""
+msgstr "Voulez-vous exécuter \"%s\" ?"
 
 #.
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Impossible d'accéder au script cgi"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
-msgstr "Bons conseils"
+msgstr "Bon conseil"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Un excellent serveur http pour VMS est disponible via"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "ce lien"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
-msgstr "Il offre un soutien <b>hors pair</b> pour le script CGI.\n"
+msgstr "Il offre un soutien <b>hors pair</b> pour les scripts CGI.\n"
 
 #: src/LYClean.c:122
 msgid "Exiting via interrupt:"
-msgstr "Sortie par interruption"
+msgstr "Sortie par interruption :"
 
 #: src/LYCookie.c:2461
 msgid "(from a previous session)"
-msgstr "(a partir d'une session précédente)"
+msgstr "(d'une session précédente)"
 
 #: src/LYCookie.c:2522
 msgid "Maximum Gobble Date:"
-msgstr "Date d'expiration maximale :"
+msgstr "Date d'obtention maximale :"
 
 #: src/LYCookie.c:2562
 msgid "Internal"
@@ -3808,11 +3811,11 @@ msgstr "Interne"
 
 #: src/LYCookie.c:2563
 msgid "cookie_domain_flag_set error, aborting program"
-msgstr "erreur de mise en place de flag de domaine de cookie, fermeture du programme"
+msgstr "erreur cookie_domain_flag_set, fin du programme"
 
 #: src/LYCurses.c:1088
 msgid "Terminal initialisation failed - unknown terminal type?"
-msgstr "Défaut d'initialisation au terminal; type de terminal inconnu?"
+msgstr "Défaut d'initialisation du terminal ; type de terminal inconnu ?"
 
 #: src/LYCurses.c:1546
 msgid "Terminal ="
@@ -3828,7 +3831,7 @@ msgstr "Votre type de terminal n'est pas reconnu."
 
 #: src/LYCurses.c:1600
 msgid "Enter a terminal type:"
-msgstr "Entrez un type de terminal"
+msgstr "Entrez un type de terminal :"
 
 #: src/LYCurses.c:1614
 msgid "TERMINAL TYPE IS SET TO"
@@ -3856,58 +3859,56 @@ msgstr ""
 "\n"
 "Merci de prévenir votre administrateur système pour confirmer un bug.\n"
 "Si le bug est confirmé, merci de prévenir la liste de diffusion lynx-dev.\n"
-"Les rapports de bugs devraient être des descriptions concises du problème \n"
-"associés à la commande ou à l'URL qui en a été la cause. Ils devraient aussi\n"
-"contenir les informations relatives à l'os utilisé, sa version, l'implémentation\n"
-"TCP/IP, le TRACEBACK si il a put être capturé ainsi que toute information pouvant\n"
-"s'avérer utile\n"
+"Les rapports de bugs devraient être des descriptions concises de la\n"
+"commande et/ou de l'URL en cause, précisant le système d'exploitation\n"
+"et sa version, l'implémentation TCP/IP, le TRACEBACK si il a pu être\n"
+"capturé ainsi que toute information pouvant s'avérer utile.\n"
 
 #: src/LYEdit.c:266
-#, fuzzy, c-format
+#, c-format
 msgid "Error starting editor, %s"
-msgstr "Erreur à la ligne %d de %s\n"
+msgstr "Erreur en lançant l'éditeur, %s"
 
 #: src/LYEdit.c:269
 msgid "Editor killed by signal"
-msgstr "Editeur tué par signal"
+msgstr "Editeur interrompu par signal"
 
 #: src/LYEdit.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "Editor returned with error status %s"
-msgstr "L'éditeur à retourné un code d'erreur %s"
+msgstr "L'éditeur a retourné un code d'erreur %s"
 
 #: src/LYDownload.c:504
 msgid "Downloaded link:"
-msgstr "Lien téléchargé:"
+msgstr "Lien téléchargé :"
 
 #: src/LYDownload.c:509
 msgid "Suggested file name:"
-msgstr "Nom de fichier suggéré"
+msgstr "Nom de fichier suggéré :"
 
 #: src/LYDownload.c:514
 msgid "Standard download options:"
-msgstr "Options standard de téléchargement:"
+msgstr "Options standard de téléchargement :"
 
 #: src/LYDownload.c:515
 msgid "Download options:"
-msgstr "Options de déchargement de fichier :"
+msgstr "Options de téléchargement :"
 
 #: src/LYDownload.c:531
 msgid "Save to disk"
 msgstr "Enregistrement sur disque"
 
 #: src/LYDownload.c:545
-#, fuzzy
 msgid "View temporary file"
-msgstr "Envoyer le fichier par regardez le fichier temporaire"
+msgstr "Voir le fichier temporaire"
 
 #: src/LYDownload.c:552
 msgid "Save to disk disabled."
-msgstr "Enregistrement sur disque désactivé"
+msgstr "Enregistrement sur disque désactivé."
 
 #: src/LYDownload.c:556 src/LYPrint.c:1310
 msgid "Local additions:"
-msgstr "Ajout local:"
+msgstr "Ajouts locaux :"
 
 #: src/LYDownload.c:567 src/LYUpload.c:211
 msgid "No Name Given"
@@ -3935,7 +3936,7 @@ msgstr " (de l'Historique)"
 
 #: src/LYHistory.c:845
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
-msgstr "Vous avez consulté (fichiers POST, références et signets exclus):"
+msgstr "Vous avez consulté (données POST, références et signets exclus) :"
 
 #: src/LYHistory.c:1138
 msgid "(No messages yet)"
@@ -3943,15 +3944,15 @@ msgstr "(Pas encore de message)"
 
 #: src/LYLeaks.c:220
 msgid "Invalid pointer detected."
-msgstr "Détection de pointeur non valide"
+msgstr "Pointeur non valide détecté."
 
 #: src/LYLeaks.c:222 src/LYLeaks.c:260
 msgid "Sequence:"
-msgstr ""
+msgstr "Séquence :"
 
 #: src/LYLeaks.c:225 src/LYLeaks.c:263
 msgid "Pointer:"
-msgstr "Pointeur:"
+msgstr "Pointeur :"
 
 #: src/LYLeaks.c:234 src/LYLeaks.c:241 src/LYLeaks.c:282
 msgid "FileName:"
@@ -3959,44 +3960,43 @@ msgstr "Nom de fichier :"
 
 #: src/LYLeaks.c:237 src/LYLeaks.c:244 src/LYLeaks.c:285 src/LYLeaks.c:296
 msgid "LineCount:"
-msgstr "Nombre de lignes:"
+msgstr "Nombre de lignes :"
 
 #: src/LYLeaks.c:258
 msgid "Memory leak detected."
-msgstr "Fuite de mémoire détectée"
+msgstr "Fuite de mémoire détectée."
 
 #: src/LYLeaks.c:266
 msgid "Contains:"
-msgstr "Contient:"
+msgstr "Contient :"
 
 #: src/LYLeaks.c:279
 msgid "ByteSize:"
-msgstr "Taille de byte"
+msgstr "Taille (octets) :"
 
 #: src/LYLeaks.c:293
 msgid "realloced:"
-msgstr "réallouée:"
+msgstr "réallocation(s) :"
 
 #: src/LYLeaks.c:314
 msgid "Total memory leakage this run:"
-msgstr "Total de fuite de mémoire pour cette exécution:"
+msgstr "Total de fuites de mémoire pour cette exécution :"
 
 #: src/LYLeaks.c:317
 msgid "Peak allocation"
-msgstr ""
+msgstr "Pic d'allocation mémoire"
 
 #: src/LYLeaks.c:318
-#, fuzzy
 msgid "Bytes allocated"
-msgstr "réallouée:"
+msgstr "Octets alloués"
 
 #: src/LYLeaks.c:319
 msgid "Total mallocs"
-msgstr ""
+msgstr "Total des réservations \"malloc\""
 
 #: src/LYLeaks.c:320
 msgid "Total frees"
-msgstr ""
+msgstr "Total des libérations \"free\""
 
 #: src/LYList.c:84
 msgid "References in "
@@ -4022,274 +4022,273 @@ msgstr "Références"
 msgid "Visible links"
 msgstr "Liens visibles"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Impossible d'obtenir l'état de '%s'."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
-msgstr "L'élément sélectionne n'est ni un fichier ni un répertoire. Requête ignorée."
+msgstr "L'élément sélectionné n'est ni un fichier ni un répertoire. Requête ignorée."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
-msgstr "Opération (%s) impossible dû à une erreur système!"
+msgstr "Opération (%s) impossible suite à une erreur système !"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
-msgstr "Défaut de %s dû probablement à une erreur système"
+msgstr "Echec de %s dû probablement à une erreur système."
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "destruction de %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
-msgstr ""
+msgstr "%s atteint"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "déplacement de %s vers %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Le répertoire existe déjà. Requête ignorée."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Ce fichier existe déjà. Requête ignorée."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Ce nom est déjà utilisé. Requête ignorée."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
-msgstr "La destination possédé un autre propriétaire. Requête ignorée."
+msgstr "Destination possédée par un autre propriétaire. Requête ignorée."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "La destination n'est pas un répertoire valide. Requête ignorée."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
-msgstr "Détruire tout les répertoires et fichiers marqués ?"
+msgstr "Détruire tous les répertoires et fichiers marqués ?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
-msgstr "Entrer un nouvel emplacement pour articles marqués : "
+msgstr "Entrer un nouvel emplacement pour éléments marqués : "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
-msgstr "Chemin trop longue"
+msgstr "Chemin trop long"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
-msgstr "Source et destination identiques; demande non traitée"
+msgstr "Source et destination au même endroit ; demande ignorée !"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Entrer un nouveau nom pour le répertoire : "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Entrer un nouveau nom pour le fichier : "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
-msgstr "Caractère  «/» non autorisé; demande non traitée."
+msgstr "Caractère séparateur de fichier illégal ; demande non traitée."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
-msgstr "Entrez nouvel emplacement pour répertoire : "
+msgstr "Entrez le nouvel emplacement du répertoire : "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
-msgstr "Entrez une nouvelle localisation pour le fichier:"
+msgstr "Entrez la nouvelle localisation du fichier :"
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
-msgstr "Impossible de trouver la marque de fin de fichier \"/\""
+msgstr "Echec. Impossible de trouver les séparateurs dans le chemin"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "La source et la destination sont similaires. Requête ignorée."
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Modifier nom, emplacement ou permission (n, l ou p) : "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Modifier le nom ou l'emplacement (n ou l) : "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
-msgstr "Option non encore disponible"
+msgstr "Fonctionnalité non encore disponible."
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
-msgstr "Entrez le nom du fichier : "
+msgstr "Entrez le nom du fichier à créer : "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
-msgstr "Réacheminement \"//\" non autorisé; demande non traitée"
+msgstr "Réacheminement \"//\" non autorisé ; demande non traitée."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Entrer le nom du nouveau répertoire : "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
-msgstr "Créer un fichier ou un répertoire (f ou r) :"
+msgstr "Créer un fichier ou un répertoire (f ou d) :"
 
-#: src/LYLocal.c:1164
-#, fuzzy, c-format
+#: src/LYLocal.c:1166
+#, c-format
 msgid "Remove directory '%s'?"
-msgstr "Supprimer le fichier '%s'"
+msgstr "Supprimer le répertoire '%s' ?"
 
-#: src/LYLocal.c:1167
-#, fuzzy
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
-msgstr " répertoire"
+msgstr "Supprimer le répertoire ?"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
-msgstr "Supprimer le fichier '%s'"
+msgstr "Supprimer le fichier '%s' ?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
-msgstr "Supprimer le fichier"
+msgstr "Supprimer le fichier ?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
-msgstr "Supprimer le lien symbolique '%s'"
+msgstr "Supprimer le lien symbolique '%s' ?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
-msgstr "Supprimer le lien symbolique"
+msgstr "Supprimer le lien symbolique ?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
-msgstr "Désolé, impossible d'accepter les fichier non UNIX pour le moment"
+msgstr "Désolé, impossible d'accepter les fichiers non UNIX pour le moment."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
-msgstr "Impossible d'ouvrir le fichier demandé"
+msgstr "Impossible d'ouvrir le fichier de permissions."
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Spécifier les permissions d'accès ci-après :"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Propriétaire :"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Groupe"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Autres :"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "formulaire pour permission"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
-msgstr "Format de mode non valide"
+msgstr "Format de mode non valide."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
-msgstr "Format de syntaxe non valide"
+msgstr "Format de syntaxe non valide."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
-msgstr "Le fichier UUDecoded sera dans le répertoire où vous avez lancé Lynx"
+msgstr "Attention : le fichier \"UUDécodé\" sera dans le répertoire où vous avez lancé Lynx."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
-msgstr "pointeur vers une URL nulle"
+msgstr "pointeur sur URL nul"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
-msgstr "Exécution de la commande %s "
+msgstr "Exécution : %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Exécution de la commande système. Veuillez patienter."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
-msgstr "Le répertoire courant:"
+msgstr "Le répertoire courant :"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
-msgstr "La sélection courante:"
+msgstr "La sélection courante :"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Il n'y a rien de sélectionné."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
-msgstr "élément marqué"
+msgstr "élément marqué :"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
-msgstr "éléments marqués"
+msgstr "éléments marqués :"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
-msgstr "Nom de fichier invalide; demande non traitée"
+msgstr "Nom de fichier non valide ; demande non traitée."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Installation dans le répertoire choisi non permise."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "L'élément sélectionné n'est pas un répertoire valide. Requête ignorée."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
-msgstr "Un instant s'il vous plais..."
+msgstr "Un instant svp..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr "Erreur lors de la mise en place des arguments d'installation"
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
-msgstr "Source et destination identiques; demande non traitée: %s"
+msgstr "Source et destination identiques : %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
-msgstr "Le répertoire courant est: %s"
+msgstr "Déjà dans le répertoire destination : %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Installation terminée"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
-msgstr "L'URL ou la liste temporaires seraient trop longs."
+msgstr "L'URL ou la liste temporaires seraient trop longues."
 
 #: src/LYMail.c:520
 msgid "Sending"
@@ -4324,21 +4323,21 @@ msgstr "Ce message est généré automatiquement par"
 
 #: src/LYMail.c:1728
 msgid "No system mailer configured"
-msgstr ""
+msgstr "Aucun agent de courrier sortant"
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Pas de Winsock trouvée, désolé."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "vous DEVEZ définir une zone TMP ou TEMP valide !"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Pas de tel répertoire"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4346,11 +4345,11 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Le fichier de configuration %s n'est pas disponible.\n"
+"Le fichier de configuration \"%s\" n'est pas disponible.\n"
 "\n"
 
 # src/LYMain.c
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4358,10 +4357,10 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Jeux de caractères Lynx non précisés.\n"
+"Jeux de caractères Lynx non déclaré.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4369,10 +4368,10 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Relevé de liens Lynx non déclaré.\n"
+"Plan d'édition Lynx non déclaré.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4380,71 +4379,69 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Le fichier Lynx %s n'est pas disponible.\n"
+"Le fichier Lynx \"%s\" n'est pas disponible.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
-msgstr ""
+msgstr "%d caractères ignorés sur l'entrée standard.\n"
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
-msgstr ""
+msgstr "Utilisez \"-stdin\" or \"-\" pour préciser la gestion du flux d'entrée.\n"
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
-msgstr "Attention:"
+msgstr "Attention :"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
-msgstr "L'état des cookies persistant ne seront changés qu'au cours de la prochaine session."
+msgstr "L'état des cookies persistants sera changé au cours de la prochaine session seulement."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
-msgstr "Lynx: ignorer le charset=%s inconnu\n"
+msgstr "Lynx : jeu de caractères=%s inconnu et ignoré\n"
 
-#: src/LYMain.c:3180
-#, fuzzy, c-format
+#: src/LYMain.c:3181
+#, c-format
 msgid "%s Version %s (%s)"
-msgstr "%s Version %s (%s)\n"
+msgstr "%s Version %s (%s)"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Compilé le %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
-msgstr ""
+msgstr "Copyrights :  Lynx Developers Group,"
 
-#: src/LYMain.c:3241
-#, fuzzy
+#: src/LYMain.c:3242
 msgid "the University of Kansas, CERN, and other contributors."
-msgstr "Copyright tenu par l'université du Kansas, du CERN, et d'autres contribuants"
+msgstr "l'université du Kansas, le CERN, et d'autres contributeurs."
 
-#: src/LYMain.c:3242
-#, fuzzy
+#: src/LYMain.c:3243
 msgid "Distributed under the GNU General Public License (Version 2)."
-msgstr "Distribué sous le permis de grand public de GNU"
+msgstr "Distribué sous licence GNU General Public License (version 2)."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 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:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
-msgstr "USAGE : %s [options] [fichier]\n"
+msgstr "Utilisation : %s [options] [fichier]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Les options sont :\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s : Option non valide : %s\n"
@@ -4452,42 +4449,42 @@ msgstr "%s : Option non valide : %s\n"
 #: src/LYMainLoop.c:594
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
-msgstr "Erreur interne: lien pour la souris %d invalide"
+msgstr "Erreur interne : lien pour la souris %d non valide"
 
 #: src/LYMainLoop.c:714 src/LYMainLoop.c:5096
 msgid "A URL specified by the user"
-msgstr "Un URL spécifié par l'utilisateur"
+msgstr "Une URL spécifiée par l'utilisateur"
 
 #: src/LYMainLoop.c:1173
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
-msgstr "«Enctype multipart/form-data» non fonctionnel. Envoi impossible."
+msgstr "Type d'encodage \"multipart/form-data\" non supporté. Envoi impossible."
 
 #.
 #. * Make a name for this help file.
 #.
 #: src/LYMainLoop.c:3105
 msgid "Help Screen"
-msgstr "L'écran de Aide"
+msgstr "Ecran d'Aide"
 
 #: src/LYMainLoop.c:3226
 msgid "System Index"
 msgstr "Index système"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Entrée dans l'écran principal"
 
 #: src/LYMainLoop.c:3843
 msgid "No next document present"
-msgstr ""
+msgstr "Aucun document suivant"
 
 #: src/LYMainLoop.c:4139
 msgid "charset for this document specified explicitly, sorry..."
-msgstr "charset pour ce document spécifié explicitement, désolé..."
+msgstr "jeu de caractères pour ce document spécifié explicitement, désolé..."
 
 #: src/LYMainLoop.c:5052
 msgid "cd to:"
-msgstr "changer de répertoire vers:"
+msgstr "changer de répertoire vers :"
 
 #: src/LYMainLoop.c:5077
 msgid "A component of path is not a directory"
@@ -4495,68 +4492,67 @@ msgstr "Une partie du chemin n'est pas un répertoire."
 
 #: src/LYMainLoop.c:5080
 msgid "failed to change directory"
-msgstr "Changement de répertoire impossible"
+msgstr "échec de changement de répertoire"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
-msgstr "Relecture du document avec les paramètres actuels."
+msgstr "Relecture du document avec les paramètres actuels..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Erreur fatale - impossible d'ouvrir le fichier de sortie %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
-msgstr ""
+msgstr "centrage des TABLEs activé."
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
-msgstr ""
+msgstr "centrage des TABLEs désactivé."
 
-#: src/LYMainLoop.c:6964
-#, fuzzy
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
-msgstr "Le répertoire courant:"
+msgstr "URL courante vide."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
-msgstr ""
+msgstr "Echec de copie dans le presse-papiers."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
-msgstr ""
+msgstr "URL du document copiée dans le presse-papiers."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
-msgstr ""
+msgstr "URL du lien copiée dans le presse-papiers."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
-msgstr ""
+msgstr "Aucune URL dans le presse-papiers."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx : accès impossible au fichier de départ"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
-msgstr "lynx : fichier de départ introuvable ou son mode n'est pas reconnu"
+msgstr "lynx : fichier de départ introuvable ou n'est pas de type \"text/html\" ou \"text/plain\""
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
-msgstr "Sortie"
+msgstr "      Sortie..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-suite-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Vous postez à : "
 
@@ -4564,7 +4560,7 @@ msgstr "Vous postez à : "
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4572,13 +4568,13 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" Veuillez fournir ou éditer l'en-tête Exp. :\n"
+" Veuillez fournir votre courriel ou éditer l'entête \"From:\" :\n"
 
 #.
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4586,9 +4582,9 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" Veuillez fournir ou éditer l'en-tête Objet :\n"
+" Veuillez fournir ou éditer l'entête \"Subject:\" (Objet) :\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4596,12 +4592,12 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" Veuillez fournir ou éditer l'en-tête Organisme :\n"
+" Veuillez fournir ou éditer l'entête \"Organization:\" (Organisme) :\n"
 
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4611,13 +4607,13 @@ msgstr ""
 "\n"
 "Veuillez entrer votre message ci-après :"
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Le message n'a pas de texte original !"
 
 #: src/LYOptions.c:765
 msgid "review/edit B)ookmarks files"
-msgstr "B) Éditer fichiers signets "
+msgstr "B) Voir/Éditer les signets "
 
 #: src/LYOptions.c:767
 msgid "B)ookmark file: "
@@ -4625,251 +4621,239 @@ msgstr "B) Fichier de signets : "
 
 #: src/LYOptions.c:2127 src/LYOptions.c:2134
 msgid "ON"
-msgstr ""
+msgstr "ON"
 
 #. verbose_img variable
 #: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2285 src/LYOptions.c:2296
 msgid "OFF"
-msgstr ""
+msgstr "OFF"
 
 #: src/LYOptions.c:2129
 msgid "NEVER"
-msgstr ""
+msgstr "JAMAIS"
 
 #: src/LYOptions.c:2130
 msgid "ALWAYS"
-msgstr ""
+msgstr "TOUJOURS"
 
 #: src/LYOptions.c:2146 src/LYOptions.c:2277
 msgid "ignore"
-msgstr ""
+msgstr "ignorer"
 
 #: src/LYOptions.c:2147
 msgid "ask user"
-msgstr ""
+msgstr "demander"
 
 #: src/LYOptions.c:2148
 msgid "accept all"
-msgstr ""
+msgstr "tout accepter"
 
 #: src/LYOptions.c:2160
 msgid "ALWAYS OFF"
-msgstr ""
+msgstr "TOUJOURS \"OFF\""
 
 #: src/LYOptions.c:2161
 msgid "FOR LOCAL FILES ONLY"
-msgstr ""
+msgstr "FICHIERS LOCAUX SEULEMENT"
 
 #: src/LYOptions.c:2163
 msgid "ALWAYS ON"
-msgstr ""
+msgstr "TOUJOURS \"ON\""
 
 #: src/LYOptions.c:2175
 msgid "Numbers act as arrows"
-msgstr ""
+msgstr "touches <nombres> => <flèches>"
 
 #: src/LYOptions.c:2177
 msgid "Links are numbered"
-msgstr ""
+msgstr "Les liens sont numérotés"
 
 #: src/LYOptions.c:2180
 msgid "Links and form fields are numbered"
-msgstr ""
+msgstr "Les liens et champs de formulaire sont numérotés"
 
 #: src/LYOptions.c:2183
 msgid "Form fields are numbered"
-msgstr ""
+msgstr "Les champs de formulaires sont numérotés"
 
 #: src/LYOptions.c:2197
 msgid "Case insensitive"
-msgstr ""
+msgstr "Insensible à la casse"
 
 #: src/LYOptions.c:2198
 msgid "Case sensitive"
-msgstr ""
+msgstr "Sensible à la casse"
 
 #: src/LYOptions.c:2222
 msgid "prompt normally"
-msgstr ""
+msgstr "demander normalement"
 
 #: src/LYOptions.c:2223
 msgid "force yes-response"
-msgstr ""
+msgstr "forcer la réponse \"oui\""
 
 #: src/LYOptions.c:2224
 msgid "force no-response"
-msgstr ""
+msgstr "forcer la réponse \"non\""
 
 #: src/LYOptions.c:2242
-#, fuzzy
 msgid "Novice"
-msgstr "Aucun(e)"
+msgstr "Débutant"
 
 #: src/LYOptions.c:2243
-#, fuzzy
 msgid "Intermediate"
-msgstr "Interne"
+msgstr "Intermédiaire"
 
 #: src/LYOptions.c:2244
 msgid "Advanced"
-msgstr ""
+msgstr "Avancé(es)"
 
 #: src/LYOptions.c:2253
 msgid "By First Visit"
-msgstr ""
+msgstr "Première visite"
 
 #: src/LYOptions.c:2255
 msgid "By First Visit Reversed"
-msgstr ""
+msgstr "Première visite (inversé)"
 
 #: src/LYOptions.c:2256
 msgid "As Visit Tree"
-msgstr ""
+msgstr "Arbre de visites"
 
 #: src/LYOptions.c:2257
 msgid "By Last Visit"
-msgstr ""
+msgstr "Dernière visite"
 
 #: src/LYOptions.c:2259
 msgid "By Last Visit Reversed"
-msgstr ""
+msgstr "Dernière visite (inversé)"
 
 #. Old_DTD variable
 #: src/LYOptions.c:2270
 msgid "relaxed (TagSoup mode)"
-msgstr ""
+msgstr "souple (mode TagSoup)"
 
 #: src/LYOptions.c:2271
 msgid "strict (SortaSGML mode)"
-msgstr ""
+msgstr "strict (mode SortaSGML)"
 
 #: src/LYOptions.c:2278
 msgid "as labels"
-msgstr ""
+msgstr "comme étiquettes"
 
 #: src/LYOptions.c:2279
-#, fuzzy
 msgid "as links"
-msgstr "ce lien"
+msgstr "comme des liens"
 
 #: src/LYOptions.c:2286
-#, fuzzy
 msgid "show filename"
-msgstr "(mauvais nom de fichier)"
+msgstr "voir le nom du fichier"
 
 #: src/LYOptions.c:2297
 msgid "STANDARD"
-msgstr ""
+msgstr "Standard"
 
 #: src/LYOptions.c:2298
 msgid "ADVANCED"
-msgstr ""
+msgstr "Avancé"
 
 #: src/LYOptions.c:2329
-#, fuzzy
 msgid "Directories first"
-msgstr "Sous-répertoires :"
+msgstr "Répertoires en premier"
 
 #: src/LYOptions.c:2330
-#, fuzzy
 msgid "Files first"
-msgstr " premier"
+msgstr "Fichiers en premier"
 
 #: src/LYOptions.c:2331
 msgid "Mixed style"
-msgstr ""
+msgstr "Style mixte"
 
 #: src/LYOptions.c:2339 src/LYOptions.c:2359
-#, fuzzy
 msgid "By Name"
-msgstr "Nom :"
+msgstr "Par Nom"
 
 #: src/LYOptions.c:2340 src/LYOptions.c:2360
 msgid "By Type"
-msgstr ""
+msgstr "Par type"
 
 #: src/LYOptions.c:2341 src/LYOptions.c:2361
-#, fuzzy
 msgid "By Size"
-msgstr "Taille de byte"
+msgstr "Par Taille"
 
 #: src/LYOptions.c:2342 src/LYOptions.c:2362
-#, fuzzy
 msgid "By Date"
-msgstr "Date :"
+msgstr "Par Date"
 
 #: src/LYOptions.c:2343
 msgid "By Mode"
-msgstr ""
+msgstr "Par mode"
 
 #: src/LYOptions.c:2345
 msgid "By User"
-msgstr ""
+msgstr "Par utilisateur"
 
 #: src/LYOptions.c:2346
-#, fuzzy
 msgid "By Group"
-msgstr "Groupe"
+msgstr "Par Groupe"
 
 #: src/LYOptions.c:2371
 msgid "Do not show rate"
-msgstr ""
+msgstr "Cacher le taux"
 
 #: src/LYOptions.c:2372 src/LYOptions.c:2373
-#, fuzzy, c-format
+#, c-format
 msgid "Show %s/sec rate"
-msgstr "Transfert de données terminé"
+msgstr "Montrer le taux %s/sec"
 
 #: src/LYOptions.c:2375 src/LYOptions.c:2376
 #, c-format
 msgid "Show %s/sec, ETA"
-msgstr ""
+msgstr "Montrer %s/sec, ETA"
 
 #: src/LYOptions.c:2379
-#, fuzzy
 msgid "Show progressbar"
-msgstr "Afficher les couleurs"
+msgstr "Montrer la barre de progression"
 
 #: src/LYOptions.c:2391
 msgid "Accept lynx's internal types"
-msgstr ""
+msgstr "Accepter les types internes Lynx"
 
 #: src/LYOptions.c:2392
 msgid "Also accept lynx.cfg's types"
-msgstr ""
+msgstr "Accepter aussi les types lynx.cfg"
 
 #: src/LYOptions.c:2393
 msgid "Also accept user's types"
-msgstr ""
+msgstr "Accepter aussi les types de l'utilisateur"
 
 #: src/LYOptions.c:2394
 msgid "Also accept system's types"
-msgstr ""
+msgstr "Accepter aussi les types systèmes"
 
 #: src/LYOptions.c:2395
-#, fuzzy
 msgid "Accept all types"
-msgstr "Accepter les changements"
+msgstr "Accepter tous les types"
 
 #: src/LYOptions.c:2404
 msgid "gzip"
-msgstr ""
+msgstr "gzip"
 
 #: src/LYOptions.c:2405
 msgid "deflate"
-msgstr ""
+msgstr "deflate"
 
 #: src/LYOptions.c:2408
 msgid "compress"
-msgstr ""
+msgstr "compress"
 
 #: src/LYOptions.c:2411
 msgid "bzip2"
-msgstr ""
+msgstr "bzip2"
 
 #: src/LYOptions.c:2413
 msgid "All"
-msgstr ""
+msgstr "Tous"
 
 #: src/LYOptions.c:2681 src/LYOptions.c:2705
 #, c-format
@@ -4878,11 +4862,11 @@ msgstr "Utilisez %s pour invoquer le menu des Options."
 
 #: src/LYOptions.c:3477
 msgid "(options marked with (!) will not be saved)"
-msgstr ""
+msgstr "(les options marquées avec (!) ne seront pas sauvées)"
 
 #: src/LYOptions.c:3485
 msgid "General Preferences"
-msgstr "Références"
+msgstr "Préférences globales"
 
 #. ***************************************************************
 #. User Mode: SELECT
@@ -4898,11 +4882,11 @@ msgstr "Éditeur"
 #. Search Type: SELECT
 #: src/LYOptions.c:3500
 msgid "Type of Search"
-msgstr "Pour la recherche"
+msgstr "Type de recherche"
 
 #: src/LYOptions.c:3505
 msgid "Security and Privacy"
-msgstr ""
+msgstr "Sécurité et Vie privée"
 
 #. ***************************************************************
 #. Cookies: SELECT
@@ -4913,12 +4897,12 @@ msgstr "Cookies"
 #. Cookie Prompting: SELECT
 #: src/LYOptions.c:3523
 msgid "Invalid-Cookie Prompting"
-msgstr ""
+msgstr "Dialogue pour les cookies non valides"
 
 #. SSL Prompting: SELECT
 #: src/LYOptions.c:3530
 msgid "SSL Prompting"
-msgstr ""
+msgstr "Dialogue SSL"
 
 #: src/LYOptions.c:3536
 msgid "Keyboard Input"
@@ -4928,7 +4912,7 @@ msgstr "Entrée du clavier"
 #. Keypad Mode: SELECT
 #: src/LYOptions.c:3540
 msgid "Keypad mode"
-msgstr "Pavé numérique"
+msgstr "Mode pavé numérique"
 
 #. Emacs keys: ON/OFF
 #: src/LYOptions.c:3546
@@ -4944,35 +4928,33 @@ msgstr "Touches vi"
 #. well, at least 2 line edit styles available
 #: src/LYOptions.c:3559
 msgid "Line edit style"
-msgstr ""
+msgstr "Style d'édition de ligne"
 
 #. Keyboard layout: SELECT
 #: src/LYOptions.c:3571
-#, fuzzy
 msgid "Keyboard layout"
-msgstr "Entrée du clavier"
+msgstr "Plan du clavier"
 
 #.
 #. * Display and Character Set
 #.
 #: src/LYOptions.c:3585
 msgid "Display and Character Set"
-msgstr "Variable d'affichage"
+msgstr "Affichage et jeu de caractères"
 
 #. Use locale-based character set: ON/OFF
 #: src/LYOptions.c:3590
-#, fuzzy
 msgid "Use locale-based character set"
-msgstr "charset présumé du document:"
+msgstr "Utiliser le jeu de caractères local"
 
 #. Display Character Set: SELECT
 #: src/LYOptions.c:3599
 msgid "Display character set"
-msgstr "Afficher le charset"
+msgstr "Afficher le jeu de caractères"
 
 #: src/LYOptions.c:3630
 msgid "Assumed document character set"
-msgstr "charset présumé du document:"
+msgstr "Jeu de caractères présumé du document"
 
 #.
 #. * Since CJK people hardly mixed with other world
@@ -4981,11 +4963,11 @@ msgstr "charset présumé du document:"
 #.
 #: src/LYOptions.c:3650
 msgid "CJK mode"
-msgstr ""
+msgstr "Mode CJK"
 
 #: src/LYOptions.c:3652
 msgid "Raw 8-bit"
-msgstr "Mode 8-bit"
+msgstr "Mode 8-bit \"brut\""
 
 #. X Display: INPUT
 #: src/LYOptions.c:3660
@@ -5010,20 +4992,18 @@ msgstr "Afficher le curseur"
 
 #. Underline links: ON/OFF
 #: src/LYOptions.c:3702
-#, fuzzy
 msgid "Underline links"
-msgstr "Liens cachés :"
+msgstr "Souligner les liens"
 
 #. Show scrollbar: ON/OFF
 #: src/LYOptions.c:3709
-#, fuzzy
 msgid "Show scrollbar"
-msgstr "Afficher les couleurs"
+msgstr "Montrer l'ascenseur"
 
 #. Select Popups: ON/OFF
 #: src/LYOptions.c:3716
 msgid "Popups for select fields"
-msgstr "Fenêtre popup pour les champs sélectionnés."
+msgstr "Fenêtre popup pour les champs sélectionnés"
 
 #. HTML error recovery: SELECT
 #: src/LYOptions.c:3722
@@ -5045,7 +5025,7 @@ msgstr "Images verbeuses"
 #.
 #: src/LYOptions.c:3750
 msgid "Headers Transferred to Remote Servers"
-msgstr "Les headers sont transférés aux serveurs distants"
+msgstr "Entêtes transférés aux serveurs distants"
 
 #. ***************************************************************
 #. Mail Address: INPUT
@@ -5054,47 +5034,44 @@ msgid "Personal mail address"
 msgstr "Adresse email personnelle"
 
 #: src/LYOptions.c:3760
-#, fuzzy
 msgid "Password for anonymous ftp"
-msgstr "Mot de passe pour l'hôte de forums '%s' :"
+msgstr "Mot de passe pour l'accès FTP anonyme"
 
 #. Preferred media type: SELECT
 #: src/LYOptions.c:3766
-#, fuzzy
 msgid "Preferred media type"
-msgstr "%d bytes transférés"
+msgstr "Type média préféré"
 
 #. Preferred encoding: SELECT
 #: src/LYOptions.c:3772
-#, fuzzy
 msgid "Preferred encoding"
-msgstr "Langue préférée"
+msgstr "Encodage préféré"
 
 #. Preferred Document Character Set: INPUT
 #: src/LYOptions.c:3778
 msgid "Preferred document character set"
-msgstr "Jeu de caractères préféré"
+msgstr "Jeu de caractères de document préféré"
 
 #. Preferred Document Language: INPUT
 #: src/LYOptions.c:3783
 msgid "Preferred document language"
-msgstr "Langue préférée"
+msgstr "Langue de document préférée"
 
 #: src/LYOptions.c:3789
 msgid "User-Agent header"
-msgstr "Header 'User-Agent'"
+msgstr "Entête \"User-Agent\""
 
 #.
 #. * Listing and Accessing Files
 #.
 #: src/LYOptions.c:3797
 msgid "Listing and Accessing Files"
-msgstr "Listes et acces aux fichiers"
+msgstr "Listes et accès aux fichiers"
 
 #. FTP sort: SELECT
 #: src/LYOptions.c:3802
 msgid "Use Passive FTP"
-msgstr ""
+msgstr "Utiliser le mode FTP passif"
 
 #. FTP sort: SELECT
 #: src/LYOptions.c:3808
@@ -5108,9 +5085,8 @@ msgstr "Critère de tri des répertoires locaux."
 
 #. Local Directory Order: SELECT
 #: src/LYOptions.c:3822
-#, fuzzy
 msgid "Local directory sort order"
-msgstr "Critère de tri des répertoires locaux."
+msgstr "Ordre de tri des répertoires locaux"
 
 #: src/LYOptions.c:3831
 msgid "Show dot files"
@@ -5123,67 +5099,66 @@ msgstr "Liens à éxécuter"
 #. Show transfer rate: SELECT
 #: src/LYOptions.c:3859
 msgid "Show transfer rate"
-msgstr "Transfert de données terminé"
+msgstr "Montrer le taux de transfert"
 
 #.
 #. * Special Files and Screens
 #.
 #: src/LYOptions.c:3879
 msgid "Special Files and Screens"
-msgstr "Fichiers et écrans spéciaux."
+msgstr "Fichiers et écrans spéciaux"
 
 #: src/LYOptions.c:3884
 msgid "Multi-bookmarks"
-msgstr "Bookmarks multiples"
+msgstr "Signets multiples"
 
 #: src/LYOptions.c:3892
 msgid "Review/edit Bookmarks files"
-msgstr "Revoir/Éditer les fichiers Bookmarks"
+msgstr "Revoir/Éditer les fichiers signets"
 
 #: src/LYOptions.c:3894
 msgid "Goto multi-bookmark menu"
-msgstr "Aller au menu multi-bookmarks"
+msgstr "Aller au menu signets multiples"
 
 #: src/LYOptions.c:3896
 msgid "Bookmarks file"
-msgstr "Fichier de Bookmarks"
+msgstr "Fichier de signets"
 
 #. Auto Session: ON/OFF
 #: src/LYOptions.c:3903
 msgid "Auto Session"
-msgstr ""
+msgstr "Session Auto"
 
 #. Session File Menu: INPUT
 #: src/LYOptions.c:3909
 msgid "Session file"
-msgstr ""
+msgstr "Fichier de session"
 
 #. Visited Pages: SELECT
 #: src/LYOptions.c:3915
 msgid "Visited Pages"
-msgstr "la Page des liens activés"
+msgstr "Pages visitées"
 
 #: src/LYOptions.c:3920
-#, fuzzy
 msgid "View the file "
-msgstr "Envoyer le fichier par courrier"
+msgstr "Voir le fichier"
 
 #: src/LYPrint.c:937
 #, c-format
 msgid " Print job complete.\n"
-msgstr "Chargement incomplet.\n"
+msgstr "Impression terminée.\n"
 
 #: src/LYPrint.c:1262
 msgid "Document:"
-msgstr "Document:"
+msgstr "Document :"
 
 #: src/LYPrint.c:1263
 msgid "Number of lines:"
-msgstr "Nombre de lignes:"
+msgstr "Nombre de lignes :"
 
 #: src/LYPrint.c:1264
 msgid "Number of pages:"
-msgstr "Nombre de pages:"
+msgstr "Nombre de pages :"
 
 #: src/LYPrint.c:1265
 msgid "pages"
@@ -5203,11 +5178,11 @@ msgstr "Certaines fonctions d'impression ont été désactivées."
 
 #: src/LYPrint.c:1277
 msgid "Standard print options:"
-msgstr "Option d'impression standard."
+msgstr "Options d'impression standard."
 
 #: src/LYPrint.c:1278
 msgid "Print options:"
-msgstr "Option d'impression."
+msgstr "Options d'impression :"
 
 #: src/LYPrint.c:1285
 msgid "Save to a local file"
@@ -5227,7 +5202,7 @@ msgstr "Imprimer à l'écran"
 
 #: src/LYPrint.c:1306
 msgid "Print out on a printer attached to your vt100 terminal"
-msgstr "Utiliser la séquence vt100 pour imprimer à votre imprimante"
+msgstr "Utiliser le terminal vt100 pour imprimer"
 
 #: src/LYReadCFG.c:371
 #, c-format
@@ -5239,12 +5214,12 @@ msgid ""
 "Here FOREGROUND and BACKGROUND must be one of:\n"
 "The special strings 'nocolor' or 'default', or\n"
 msgstr ""
-"Erreur de syntaxe lors du parsage de COLOR dans le fichier de configuration\n"
-"La ligne doit être du type:\n"
-"COULEUR:ENTIER:PREMIERPLAN:ARIERREPLAN\n"
+"Erreur de syntaxe lors de l'analyse de COLOR dans le fichier de\n"
+"configuration. La ligne doit être du type:\n"
+"COULEUR:ENTIER:PREMIERPLAN:ARRIEREPLAN\n"
 "\n"
-"Ici, PREMIERPLAN et ARIERREPLAN doivent être soit\n"
-"les chaîne de caractère spéciales 'nocolor' ou 'default', ou\n"
+"Ici, PREMIERPLAN et ARRIEREPLAN doivent être au choix\n"
+"une chaîne de caractères spéciale 'nocolor' ou 'default', ou\n"
 
 #: src/LYReadCFG.c:384
 msgid "Offending line:"
@@ -5253,75 +5228,75 @@ msgstr "Ligne fautive :"
 #: src/LYReadCFG.c:681
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
-msgstr "Le changement de touche de %s vers %s pour %s a échoué\n"
+msgstr "échec de changement de touche de %s vers %s pour %s\n"
 
 #: src/LYReadCFG.c:688
 #, c-format
 msgid "key remapping of %s to %s failed\n"
-msgstr "Le changement de touche de %s vers %s a échoué\n"
+msgstr "échec du changement de touche de %s vers %s\n"
 
 #: src/LYReadCFG.c:709
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
-msgstr "Sélection d'édition de ligne de %s pour la touche %s invalide. Sélection de tous.\n"
+msgstr "Sélection de lignes éditées %s non valide pour la touche %s, sélection de l'ensemble\n"
 
 #: src/LYReadCFG.c:734 src/LYReadCFG.c:746
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
-msgstr "La définition du lien d'éditeur de ligne pour la touche %s (0x%x) vers 0x%x pour %s a échoué.\n"
+msgstr "Echec de définition (éditeur de ligne) pour la touche %s (0x%x) en 0x%x pour %s.\n"
 
 #: src/LYReadCFG.c:750
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
-msgstr "La définition de lien d'éditeur de ligne pour la touche %s (0x%x) pour %s a échoué.\n"
+msgstr "Echec de définition (éditeur de ligne) pour la touche %s (0x%x) pour %s.\n"
 
 #: src/LYReadCFG.c:846
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
-msgstr "Lynx: impossible de démarrer. Le fichier de règles CERN %s n'est pas accessible.\n"
+msgstr "Lynx : impossible de démarrer. Le fichier de règles CERN %s n'est pas accessible.\n"
 
 #: src/LYReadCFG.c:847
 msgid "(no name)"
 msgstr "(pas de nom)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, 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ées. Peut être y a t'il une boucle ?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
-msgstr "Le dernier include tenté était: '%s',\n"
+msgstr "La dernière inclusion tentée était: '%s',\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
-msgstr "include de '%s'.\n"
+msgstr "inclusion de '%s'.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
-msgstr "Les données suivantes sont lues à partie de votre fichier lynx.cfg."
+msgstr "Les données suivantes sont lues à partir de votre fichier lynx.cfg."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
-msgstr "Merci de lire la distribution"
+msgstr "Merci de chercher dans la distribution"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "pour plus de commentaires."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "RECHARGER LES MODIFICATIONS"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Votre configuration principale"
 
 #: src/LYShowInfo.c:173
 msgid "Directory that you are currently viewing"
-msgstr "Répertoire courant:"
+msgstr "Répertoire vu en ce moment"
 
 #: src/LYShowInfo.c:176
 msgid "Name:"
@@ -5333,15 +5308,15 @@ msgstr "URL :"
 
 #: src/LYShowInfo.c:193
 msgid "Directory that you have currently selected"
-msgstr "Répertoire que vous avez sélectionné"
+msgstr "Répertoire présentement sélectionné"
 
 #: src/LYShowInfo.c:195
 msgid "File that you have currently selected"
-msgstr "Fichier que vous avez sélectionné"
+msgstr "Fichier présentement sélectionné"
 
 #: src/LYShowInfo.c:198
 msgid "Symbolic link that you have currently selected"
-msgstr "Lien symbolique que vous avez sélectionné"
+msgstr "Lien symbolique présentement sélectionné"
 
 #: src/LYShowInfo.c:201
 msgid "Item that you have currently selected"
@@ -5349,196 +5324,190 @@ msgstr "Article que vous avez sélectionné"
 
 #: src/LYShowInfo.c:203
 msgid "Full name:"
-msgstr "Nom complet:"
+msgstr "Nom complet :"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
-msgstr "Impossible d'activer le lien"
+msgstr "Impossible de suivre le lien"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Pointe vers le fichier :"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Nom du propriétaire :"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Nom du groupe :"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
-msgstr "Volume du fichier :"
+msgstr "Taille du fichier :"
 
-#: src/LYShowInfo.c:226
-#, fuzzy
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
-msgstr "bytes"
+msgstr "(octets)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Date de création :"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Dernière mise à jour :"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Dernier accès :"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Permissions d'accès"
 
-#: src/LYShowInfo.c:278
-#, fuzzy
+#: src/LYShowInfo.c:279
 msgid "Group:"
-msgstr "Groupe"
+msgstr "Groupe :"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
-msgstr ""
+msgstr "Mot :"
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Fichier que vous visualisez présentement"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Nom du lien :"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Jeu de caractères :"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
-msgstr ""
+msgstr "(implicite)"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Date :"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Dernière modification :"
 
-#: src/LYShowInfo.c:351
-#, fuzzy
+#: src/LYShowInfo.c:352
 msgid "Expires:"
-msgstr "Expire:"
+msgstr "Expire :"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
-msgstr "Controle du cache"
+msgstr "Contrôle du cache :"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
-msgstr "Longueur du contenu:"
+msgstr "Longueur du contenu :"
 
-#: src/LYShowInfo.c:361
-#, fuzzy
+#: src/LYShowInfo.c:362
 msgid "Length:"
-msgstr "Longueur du contenu:"
+msgstr "Longueur :"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
-msgstr "Langage:"
+msgstr "Langage :"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "Données POST :"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "Type de contenu POST :"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Propriétaire(s) :"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "Taille :"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
-msgstr "Lignes"
+msgstr "lignes"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "mode formulaires"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "source"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
-msgstr ", sécuritaire"
+msgstr ", sécurisé"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", lien interne"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", pas de cache"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", script ISMAP"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
-msgstr ", fichier de bookmark"
+msgstr ", fichier signet"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
-msgstr "Mode :"
+msgstr "mode :"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Lien que vous avez sélectionné"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Méthode :"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Encodage :"
 
-#: src/LYShowInfo.c:435
-#, fuzzy
+#: src/LYShowInfo.c:436
 msgid "Action:"
-msgstr "Emplacement : "
+msgstr "Action : "
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(champ de formulaire)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Aucun lien dans la page courante"
 
-#: src/LYShowInfo.c:454
-#, fuzzy
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
-msgstr "Serveur :"
+msgstr "Entêtes serveur :"
 
 #: src/LYStyle.c:312
 #, c-format
@@ -5550,10 +5519,10 @@ msgid ""
 "where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n"
 "\n"
 msgstr ""
-"Erreur de syntaxe lors du parsage du style dans le fichier lss:\n"
+"Erreur de syntaxe lors de l'analyse du style dans le fichier lss:\n"
 "[%s]\n"
-"La ligne doit être du type :\n"
-"OBJET:MONO:COLOR (cad em:gras:bleubrillant:blanc)\n"
+"La ligne doit être de la forme :\n"
+"OBJET:MONO:COULEUR (em:bold:brightblue:white)\n"
 "Où OBJET est un élément parmi EM,STRONG,B,I,U,BLINK etc.\n"
 "\n"
 
@@ -5563,66 +5532,65 @@ msgstr "voici une liste de l'Historique que vous pouvez reconstituer"
 
 #: src/LYUpload.c:75
 msgid "ERROR! - upload command is misconfigured"
-msgstr "ERREUR - commande de chargement mal configurée"
+msgstr "ERREUR - commande d'envoi mal configurée"
 
 #: src/LYUpload.c:96
 msgid "Illegal redirection \"../\" found! Request ignored."
-msgstr "Réacheminement «../» non autorisé; demande non traitée"
+msgstr "Redirection «../» non autorisée ; demande non traitée."
 
 #: src/LYUpload.c:99
 msgid "Illegal character \"/\" found! Request ignored."
-msgstr "Caractère  «/» non autorisé; demande non traitée"
+msgstr "Caractère  «/» non autorisé ; demande non traitée."
 
 #: src/LYUpload.c:102
 msgid "Illegal redirection using \"~\" found! Request ignored."
-msgstr "Réacheminement avec «~» non autorisé; demande non traitée"
+msgstr "Redirection avec «~» non autorisée ; demande non traitée."
 
 #: src/LYUpload.c:159
 msgid "Unable to upload file."
-msgstr "Impossible de charger le fichier."
+msgstr "Impossible d'envoyer le fichier."
 
 #: src/LYUpload.c:201
 msgid "Upload To:"
-msgstr "Téléchargement vers:"
+msgstr "Envoi vers:"
 
 #: src/LYUpload.c:202
 msgid "Upload options:"
-msgstr "Options de chargement de fichier :"
+msgstr "Options d'envoi de fichiers :"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
-msgstr ""
+msgstr "URL du document téléchargé copiée dans le presse-papiers."
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Protocole d'accès inattendu pour ce schéma l'URL"
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
-msgstr ""
+msgstr "Trop de fichiers temporaires"
 
-#: src/LYUtils.c:3708
-#, fuzzy
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
-msgstr "Pas de restriction définies."
+msgstr "restriction inconnue"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
-msgstr "Pas de restriction définies.\n"
+msgstr "Pas de restriction définie.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
-msgstr "Définition de restriction:\n"
+msgstr "Définitions de restrictions :\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
-msgstr ""
+msgstr "Impossible de trouver le répertoire personnel (HOME)"
 
 #: src/LYrcFile.c:16
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
-msgstr ""
+msgstr "Normalement désactivé(e). Voyez ENABLE_LYNXRC dans lynx.cfg\n"
 
 #: src/LYrcFile.c:317
 msgid ""
@@ -5631,6 +5599,10 @@ msgid ""
 "prompt for each cookie.  Set accept_all_cookies to \"TRUE\" to accept\n"
 "all cookies.\n"
 msgstr ""
+"accept_all_cookies permet à l'utilisateur de dire à Lynx d'accepter\n"
+"automatiquement tous les cookies.  \"FALSE\" (non) par défaut, donc\n"
+"demande pour chaque cookie.  Mettre accept_all_cookies à \"TRUE\"\n"
+"(vrai) pour accepter tous les cookies.\n"
 
 #: src/LYrcFile.c:325
 msgid ""
@@ -5639,6 +5611,10 @@ msgid ""
 "Lynx will use the personal email address.  Set anonftp_password\n"
 "to a different value if you choose.\n"
 msgstr ""
+"anonftp_password permet à l'utilisateur de faire utiliser par Lynx l'adresse\n"
+"mail personnelle comme mot de passe FTP anonyme.  Si aucune valeur,\n"
+"précisée, Lynx utilise l'adresse personnelle.  Fixer anonftp_password\n"
+"à une autre valeur si vous le souhaitez.\n"
 
 #: src/LYrcFile.c:332
 msgid ""
@@ -5646,9 +5622,9 @@ msgid ""
 "file into which the user can paste links for easy access at a later\n"
 "date.\n"
 msgstr ""
-"bookmark_file spécifie le nom et l'emplacement du fichier de signets par défaut\n"
-"dans lequel l'utilisateur peut copier des liens pour un accès rapide\n"
-"ultérieurement.\n"
+"bookmark_file spécifie le nom et l'emplacement du fichier de signets par\n"
+"défaut dans lequel l'utilisateur peut copier des liens pour un accès\n"
+"rapide ultérieurement.\n"
 
 #: src/LYrcFile.c:337
 msgid ""
@@ -5656,9 +5632,9 @@ msgid ""
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
 "instead of case INsensitive.  The default is usually \"off\".\n"
 msgstr ""
-"Si case_sensitive_searching est réglé à «ACTIVÉ», lors d'une recherche au\n"
-"moyen des touches 's' ou '/', la recherche tient compte des maj./min. au lieu\n"
-"de reconnaître tous les caractères. La valeur par défaut est «DÉSACTIVÉ».\n"
+"Si case_sensitive_searching est réglé à «on», lors d'une recherche au\n"
+"moyen des touches 's' ou '/', la recherche tient compte de la casse au lieu\n"
+"de prendre tous les caractères. La valeur par défaut est «off».\n"
 
 #: src/LYrcFile.c:342
 msgid ""
@@ -5668,11 +5644,11 @@ msgid ""
 "set or using the 7 bit character approximations.\n"
 "Current valid characters sets are:\n"
 msgstr ""
-"Le paramètre character_set définit la représentation des caractères 8 bits\n"
-"pour votre terminal.  Si un tel caractère ne s'affiche pas correctement à\n"
-"votre écran, vous pouvez essayer de changer pour un jeu de caractères 8\n"
-"bits différent ou utiliser les caractères approximatifs 7 bits.  Les jeux\n"
-"de caractères valides courants sont :\n"
+"L'option character_set définit la représentation des caractères 8 bits\n"
+"pour votre terminal.  Si de tels caractères 8 bits ne s'affichent pas\n"
+"correctement à l'écran, vous pouvez essayer de changer pour un jeu\n"
+" de caractères 8 bits différent ou utiliser les caractères approximatifs\n"
+" 7 bits. Les jeux de caractères valides courants sont :\n"
 
 #: src/LYrcFile.c:349
 msgid ""
@@ -5682,15 +5658,19 @@ msgid ""
 "take precedence.  The accept_all_cookies parameter will override any\n"
 "settings made here.\n"
 msgstr ""
+"cookie_accept_domains et cookie_reject_domains sont des listes de\n"
+"domaines séparés par des virgules dont Lynx accepte ou rejette\n"
+"les cookies. Si un domaine est précisé dans les deux, le rejet\n"
+"prévaut.  Le paramètre accept_all_cookies est prioritaire sur les\n"
+"réglages précisés ici.\n"
 
 #: src/LYrcFile.c:357
-#, fuzzy
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
 msgstr ""
-"cookie_file spécifie le fichier à partir duquel lire les cookies\n"
-"persistants. Le défaut est ~/.lynx_cookies.\n"
+"cookie_file spécifie le fichier à partir duquel lire les cookies persistants\n"
+"Valeur par défaut : ~/"
 
 #: src/LYrcFile.c:362
 msgid ""
@@ -5702,12 +5682,21 @@ msgid ""
 "with an invalid path or domain attribute.  All domains will default to\n"
 "querying the user for an invalid path or domain.\n"
 msgstr ""
+"cookie_loose_invalid_domains, cookie_strict_invalid_domains, et\n"
+"cookie_query_invalid_domains sont des listes de domaines séparés\n"
+"par des virgules soumis à divers degrés de validation.  Si un domaine\n"
+"est \"strict\", la stricte conformation à RFC2109 est vérifiée.\n"
+"Un domaine \"loose\" est autorisé à poster des cookies avec un\n"
+"chemin ou un domaine non valides.  Pour les autres domaines\n"
+"l'utilisateur sera prévenu en cas de mauvais chemin ou domaine.\n"
 
 #: src/LYrcFile.c:376
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
 msgstr ""
+"dir_list_order spécifie l'ordre de listage des répertoires sous DIRED_SUPPORT\n"
+"(si implémenté).  Par défaut : \"ORDER_BY_NAME\"\n"
 
 #: src/LYrcFile.c:381
 msgid ""
@@ -5716,11 +5705,11 @@ msgid ""
 "files and directories together.  \"FILES_FIRST\" lists files first and\n"
 "\"DIRECTORIES_FIRST\" lists directories first.\n"
 msgstr ""
-"Le paramètre dir_list_styles spécifie le style de liste de répertoires sous\n"
-"DIRED_SUPPORT (si l'option est offerte). La valeur «MIXED_STYLE» (défaut)\n"
-"permet de trier fichiers et répertoires ensemble. La valeur «FILES_FIRST»\n"
-"permet de lister les fichiers d'abord tandis que «DIRECTORIES_FIRST» permet\n"
-"de lister les répertoires d'abord.\n"
+"L'option dir_list_styles spécifie le style de liste de répertoires sous\n"
+"DIRED_SUPPORT (si l'option est offerte). La valeur «MIXED_STYLE»\n"
+"(défaut) trie fichiers et répertoires ensemble. La valeur «FILES_FIRST»\n"
+"permet de lister les fichiers d'abord tandis que «DIRECTORIES_FIRST»\n"
+"permet de lister les répertoires d'abord.\n"
 
 #: src/LYrcFile.c:389
 msgid ""
@@ -5729,7 +5718,7 @@ msgid ""
 "  ^B = left    ^F = right\n"
 "will be enabled.\n"
 msgstr ""
-"Si emacs_keys est réglé à «ACTIVÉ», le mouvement de touche EMACS normal :\n"
+"Si emacs_keys est réglé à «on», le jeu de touches EMACS normal :\n"
 "  ^N = bas    ^P = haut\n"
 "  ^B = gauche    ^F = droite\n"
 "est activé.\n"
@@ -5757,10 +5746,10 @@ msgid ""
 msgstr ""
 "file_sorting_method spécifie le mode de tri à utiliser pour consulter\n"
 "des listes de fichiers tels que des répertoires FTP. Les options sont:\n"
-"   MOM       -- tri selon le nom de fichier\n"
-"   TYPE      -- tri selon le type de fichier\n"
-"   VOLUME    -- tri selon le volume du fichier\n"
-"   DATE      -- tri selon la date du fichier\n"
+"   BY_FILENAME -- tri selon le nom de fichier\n"
+"   BY_TYPE -- tri selon le type de fichier\n"
+"   BY_VOLUME -- tri selon la taille du fichier\n"
+"   BY_DATE -- tri selon la date du fichier\n"
 
 #: src/LYrcFile.c:424
 msgid ""
@@ -5777,16 +5766,16 @@ msgid ""
 "Current lineedit modes are:\n"
 msgstr ""
 "lineedit_mode spécifie l'association de touche utilisée pour \n"
-"entrer des chaîne de caractères dans les formulaires et les prompts.\n"
-"Si lineedit_mode est égal à \"Default Binding\" alors les caractères\n"
-"de contrôle suivant seront utilisés pour se déplacer et effacer du \n"
-"texte:\n"
+"entrer des chaîne de caractères dans les formulaires et les.\n"
+"dialogues. Si lineedit_mode est égal à \"Default Binding\" alors\n"
+"les caractères de contrôle suivants seront utilisés pour se\n"
+"déplacer et effacer du texte:\n"
 "\n"
 "                 Précèdent Suivant      Entrée = Accepter les données\n"
-"Déplacement char    <-        ->           ^G  = Annuler les données\n"
-"Déplacement mot     ^P        ^N           ^U  = Effacer la ligne.\n"
-"Effacer char        ^H        ^R           ^A  = Début de ligne.\n"
-"Effacer mot         ^B        ^F           ^E  = Fin de ligne.\n"
+"Déplacer car.     <-        ->           ^G  = Annuler les données\n"
+"Déplacer mot     ^P        ^N           ^U  = Effacer la ligne.\n"
+"Effacer car.        ^H        ^R           ^A  = Début de ligne.\n"
+"Effacer mot        ^B        ^F           ^E  = Fin de ligne.\n"
 "\n"
 "Les modes d'édition de ligne courants sont:\n"
 
@@ -5800,7 +5789,7 @@ msgstr ""
 "Vous pouvez définir des sous-catégories de signets et de descriptions.\n"
 "Le format est multi_bookmark<lettre_majuscule>=<nom_de_fichier>,<description>\n"
 "vous pouvez définir jusque 26 fichiers de signets (l'alphabet anglais).\n"
-"commencez avec «multi_bookmarkB» puisque 'A' est le fichier implicite (voir ci-après.\n"
+"commencez avec «multi_bookmarkB» car 'A' est le fichier implicite (voir après).\n"
 
 #: src/LYrcFile.c:448
 msgid ""
@@ -5813,10 +5802,10 @@ msgid ""
 "your mailed comments.\n"
 msgstr ""
 "personal_mail_address spécifie votre adresse email personelle. \n"
-"Cette adresse sera envoyée lors des transfert de fichiers HTTP comme\n"
+"Cette adresse sera envoyée lors des transferts de fichiers HTTP comme\n"
 "moyen d'autorisation,de logs et pour les commentaires postés par mail.\n"
 "Si vous ne voulez pas que cette information soit communiquée, définissez\n"
-"la variable NO_FROM_HEADER comme étant vraie (TRUE) dans lynx.cfg, ou \n"
+"la variable NO_FROM_HEADER comme étant vraie (TRUE) dans lynx.cfg, ou\n"
 "utilisez l'option -nofrom en ligne de commande. Vous pouvez aussi laisser\n"
 "ce champ vide, mais alors il n'apparaîtra pas dans vos commentaires postés.\n"
 
@@ -5835,17 +5824,17 @@ msgid ""
 "an error response, though the sending of an unacceptable response\n"
 "is also allowed.\n"
 msgstr ""
-"preferred_charset spécifie la jeu de caractère en notation MIME (cad \n"
-"ISO-8859-2, ISO-8859-5) que lynx indiquera comme jeu de caractère préféré\n"
-"lors des requêtes http en utilisant le header Accept-Charset. Cette valeur\n"
+"preferred_charset spécifie la jeu de caractères en notation MIME (cad \n"
+"ISO-8859-2, ISO-8859-5) que lynx indiquera comme jeu de car. préféré\n"
+"lors des requêtes http en utilisant l'entête Accept-Charset. Cette valeur\n"
 "ne dois PAS inclure ISO-8859-1 ou US-ASCII car ces valeurs sont toujours\n"
-"prises par défaut. La liste de choix peut être composé d'élément séparés par\n"
-"des virgules. Si un fichier dans ce jeu de caractère est disponible, \n"
-"le serveur vous l'enverra. Si il n'y a pas de header Accept-Charset, le \n"
-"comportement par défaut est d'accepter n'importe quel type de jeu de caractère.\n"
-"Si il existe un header Accept-Charset mais que le serveur ne peut renvoyer une\n"
+"prises par défaut. La liste de choix peut être composée de types séparés par\n"
+"des virgules. Si un fichier dans ce jeu de caractères est disponible, \n"
+"le serveur vous l'enverra. Si il n'y a pas d'entête Accept-Charset, le \n"
+"comportement par défaut est d'accepter n'importe quel type de jeu de car.\n"
+"Si il existe un entête Accept-Charset mais que le serveur ne peut renvoyer une\n"
 "réponse acceptable relativement à votre choix, le serveur DEVRAIT renvoyer un \n"
-"message d'erreur bien que le renvoi d'une réponse inacceptable soit permi.\n"
+"message d'erreur bien que le renvoi d'une réponse inacceptable soit permis.\n"
 
 #: src/LYrcFile.c:473
 msgid ""
@@ -5856,7 +5845,8 @@ msgid ""
 "Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 "preferred_language spécifie la langue selon le code MIME (ex., en,\n"
-"fr). Lynx tient compte des préférences lors des requêtes aux serveurs http.\n"
+"fr ou liste de langues séparées par des virgule, préférence décroissante).\n"
+"Lynx tient compte des préférences lors des requêtes aux serveurs http.\n"
 "Si un fichier est disponible dans la langue précisée, le serveur l'envoie.\n"
 "Sinon, le serveur envoie le fichier dans la langue par défaut.\n"
 
@@ -5872,14 +5862,15 @@ msgid ""
 "          or compromise security.  This should only be set to \"on\" if\n"
 "          you are viewing trusted source information.\n"
 msgstr ""
-"Si 'run_all_execution_links' est réglé à «activé», tous les liens exécutables locaux sont exécutés lorsqu'ils sont choisis.\n"
+"Si 'run_all_execution_links' est réglé à «on», tous les liens actifs\n"
+"locaux sont exécutés lorsqu'ils sont sélectionnés.\n"
 "\n"
 "AVIS -    Cette option est potentiellement très dangereuse car elle permet\n"
 "          de voir de l'information écrite par des sources inconnues ou non\n"
 "          fiables.  Il existe un danger que des fichiers Cheval de Troie\n"
 "          soient inclus.  Les fichiers troyens peuvent provoquer\n"
 "          l'effacement de fichiers ou compromettre la sécurité.  Cette\n"
-"          fonction devrait être réglée à «activé» uniquement si vous\n"
+"          fonction devrait être réglée à «on» uniquement si vous\n"
 "          consultez de l'information fiable.\n"
 
 #: src/LYrcFile.c:495
@@ -5897,11 +5888,11 @@ msgid ""
 "          or compromise security.  This should only be set to \"on\" if\n"
 "          you are viewing trusted source information.\n"
 msgstr ""
-"Si 'run_execution_links_on_local_files' est réglé à «activé», tous les liens\n"
-"exécutables qui se trouvent dans des fichiers LOCAUX seront exécutés lorsque\n"
+"Si 'run_execution_links_on_local_files' est réglé à «on», tous les liens\n"
+"actifs qui se trouvent dans des fichiers LOCAUX seront exécutés lorsque\n"
 "choisis. Cette option est différente de 'run_all_execution_links' en ce que\n"
-"les permissions d'accès sont accordées uniquement pour les fichiers hébergés\n"
-"sur le serveur local.\n"
+"les permissions d'accès sont accordées uniquement pour les fichiers du\n"
+"système local.\n"
 "\n"
 "AVIS -    Cette option est potentiellement très dangereuse car elle permet de\n"
 "          voir de l'information écrite par des sources inconnues ou non fiables.\n"
@@ -5948,11 +5939,11 @@ msgid ""
 "\"off\" \"show color\" settings will be treated as \"default\".\n"
 msgstr ""
 "show_color permet de paramétrer le mode couleur à l'initialisation.  La\n"
-"valeur «jamais» désactive le mode couleur (ce qui équivaut à un terminal\n"
+"valeur «never» désactive le mode couleur (ce qui équivaut à un terminal\n"
 "monochrome) même si le terminal est capable d'afficher les couleurs.  La\n"
-"valeur «toujours» active le mode couleur même si le terminal est\n"
+"valeur «always» active le mode couleur même si le terminal est\n"
 "monochrome, en autant que cette valeur soit incluse dans la librairie\n"
-"utilisée pour créer Lynx.  La valeur «implicite» suppose par défaut un\n"
+"utilisée pour créer Lynx.  La valeur «default» suppose par défaut un\n"
 "terminal monochrome à moins que la capacité d'afficher les couleurs soit\n"
 "déterminée à l'initialisation en fonction du type de terminal, ou que\n"
 "l'option -color soit entrée à la ligne de commande, ou que la variable\n"
@@ -5962,8 +5953,8 @@ msgstr ""
 "annulé en permutant les options -color et -nocolor sur la ligne de\n"
 "commande.  Le mode attribué à l'initialisation peut être modifié au moyen\n"
 "de l'option «afficher les couleurs» dans le menu Paramètres.  Si les\n"
-"paramètres sont enregistrés, les attributs «oui» et «non» de l'option\n"
-"«afficher les couleurs» sont interprétés comme étant la valeur «implicite».\n"
+"paramètres sont enregistrés, les attributs «on» et «off» de l'option\n"
+"«afficher les couleurs» sont interprétés comme étant la valeur «default».\n"
 
 #: src/LYrcFile.c:540
 msgid ""
@@ -5977,14 +5968,14 @@ msgid ""
 "default while a value of \"off\" will set 'hiding' of the cursor.\n"
 "The default can be overridden via the -show_cursor command line toggle.\n"
 msgstr ""
-"show_cursor permet d'indiquer si le curseur doit être 'caché' à la droite\n"
+"show_cursor permet d'indiquer si le curseur doit être caché à droite\n"
 "(et au bas, si possible) de l'écran, ou s'il doit être placé à la gauche du\n"
 "lien actif dans les documents, ou de l'option active dans les fenêtres\n"
 "flash.  Le placement du curseur à la gauche de l'option ou du lien actif\n"
 "est utile dans le cas des interfaces de reconnaissance de la parole ou de\n"
 "braille, et quand le terminal est incapable de distinguer le lien actif au\n"
-"moyen de la surbrillance ou de la couleur.  La valeur «oui» règle le\n"
-"placement du curseur à la gauche par défaut, tandis que la valeur «non»\n"
+"moyen de la surbrillance ou de la couleur.  La valeur «on» règle le\n"
+"placement du curseur à la gauche par défaut, tandis que la valeur «off»\n"
 "équivaut à 'cacher' le curseur de l'écran.  La valeur implicite peut être\n"
 "annulée à la ligne de commande au moyen de l'option -show_cursor.\n"
 
@@ -5997,7 +5988,7 @@ msgid ""
 "is disabled, creation of such files via Lynx also is disabled.\n"
 msgstr ""
 "Le paramètre show_dotfiles spécifie que la liste des répertoires doit\n"
-"inclure les fichiers et répertoires «cachés».  S'il est réglé à «ACTIVÉ»,\n"
+"inclure les fichiers et répertoires «cachés».  S'il est réglé à «on»,\n"
 "il n'est pris en compte que s'il est activé dans userdefs.h et/ou lynx.cfg\n"
 "et s'il n'est pas restreint par une option de la ligne de commande.  Si\n"
 "l'affichage des fichiers cachés est désactivé, la création de tels fichiers\n"
@@ -6015,13 +6006,13 @@ msgid ""
 "user modes.  When this option is set to \"standard\", the menu will be\n"
 "presented regardless of user mode.\n"
 msgstr ""
-"Si le sub_bookmark n'est pas désactivé (\"off\") et que les bookmarks\n"
+"Si le sub_bookmark n'est pas désactivé (\"off\") et que les signets\n"
 "multiples (cf plus bas) ont étés définis, alors toutes les opérations\n"
-"relatives aux bookmarks déclencheront un prompt utilisateur afin qu'il\n"
-"puisse sélectionner un fichier de sous bookmark actif. Si le fichier \n"
-"de bookmark par défaut est défini (cf plus haut), il sera utilisé comme\n"
-"la sélection par défaut. Lorsque cette option est définie comme \"avancée\"\n"
-"et que le mode d'utilisation est avancé, la commande 'v'oire les bookmarks\n"
+"relatives aux signets déclencheront un dialogue utilisateur afin qu'il\n"
+"puisse sélectionner un fichier de sous signet actif. Si le fichier \n"
+"de signets par défaut est défini (cf plus haut), il sera utilisé comme\n"
+"la sélection par défaut. Lorsque cette option est fixée à \"advanced\"\n"
+"et que le mode d'utilisation est avancé, la commande 'v'oire les signets\n"
 "invoquera un prompt sur la ligne d'état au lieu du menu qui apparait dans les\n"
 "modes novices et intermédiaires. Lorsque cette option est définie comme \n"
 "\"standard\", le menu apparaîtra quelque soit le mode d'utilisation.\n"
@@ -6048,8 +6039,9 @@ msgid ""
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
 "See also VERBOSE_IMAGES in lynx.cfg\n"
 msgstr ""
-"Si verbose_images est à \"on\", lynx affichera les noms des fichier d'images\n"
-"sources au lieu de [INLINE],[LINK] ou [IMAGE]\n"
+"Si verbose_images est à \"on\", lynx affichera les noms des fichiers\n"
+"sources d'images au lieu de [INLINE],[LINK] ou [IMAGE]\n"
+"Voir aussi VERBOSE_IMAGES dans lynx.cfg\n"
 
 #: src/LYrcFile.c:590
 msgid ""
@@ -6060,7 +6052,7 @@ msgid ""
 "Capital 'H', 'J' and 'K will still activate help, jump shortcuts,\n"
 "and the keymap display, respectively.\n"
 msgstr ""
-"Si vi_keys est réglé à «ACTIVÉ», le mouvement de touches VI normal :\n"
+"Si vi_keys est réglé à «on», le mouvement de touches VI normal :\n"
 "  j = bas     k = haut\n"
 "  h = gauche  l = droite\n"
 "est activé.  Ces touches sont en minuscule uniquement.\n"
@@ -6072,7 +6064,7 @@ msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
-"L'option visited_links controle la façon dont Lynx organise les informations\n"
+"L'option visited_links contrôle la façon dont Lynx organise les informations\n"
 "sur la page Liens visités.\n"
 
 #: src/LYrcFile.c:819
@@ -6086,12 +6078,12 @@ msgid ""
 "regardless of whether numlock is on.\n"
 msgstr ""
 "Si keypad_mode est définit comme \"NUMBERS_AS_ARROWS\", alors les \n"
-"chiffres de votre pavé numérique se comporterons comme des flèches\n"
+"chiffres de votre pavé numérique se comporteront comme des flèches\n"
 "lorsque numlock est à on:\n"
 "               8 = haut \n"
 "     4 = gauche           6 = droite \n"
 "               2 = bas \n"
-"et les chiffres correspondants de votre clavier se comporterons\n"
+"et les chiffres correspondants de votre clavier se comporteront\n"
 "comme des flèches, quelque soit l'état du numlock.\n"
 
 #: src/LYrcFile.c:828
@@ -6100,8 +6092,7 @@ msgid ""
 "appear next to each link and numbers are used to select links.\n"
 msgstr ""
 "Si keypad_mode est défini comme \"LINKS_ARE_NUMBERED\"; alors des \n"
-"chifres apparaitrons à cotés des liens afin de pouvoir sélectionner\n"
-"ces liens\n"
+"nombres apparaitront à coté des liens afin de pouvoir les sélectionner.\n"
 
 #: src/LYrcFile.c:832
 msgid ""
@@ -6114,11 +6105,11 @@ msgid ""
 "lists and output from the list command also enumerate form inputs.\n"
 msgstr ""
 "Si keypad_mode est défini comme \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\",\n"
-"alors des nombres apparaîtrons à coté de chaque liens et des champs\n"
+"alors des nombres apparaîtront à coté de chaque liens et des champs\n"
 "de formulaires. Ces nombres seront utilisés pour sélectionner un lien, \n"
 "ou pour déplacer le \"lien courant\" vers un champ de formulaire ou \n"
-"un bouton. En plus, les options des menus popup seront indexés afin que \n"
-"l'utilisateur puisse tapper un chiffre pour sélectionner une option de l'un\n"
+"un bouton. En plus, les options des menus popup seront indexées afin que \n"
+"l'utilisateur puisse taper un chiffre pour sélectionner une option de l'un\n"
 "de ces menus,même si cette option n'est pas visible à l'écran. Les listes\n"
 "de référence et les sorties de ces listes de commandes énumèrent aussi les\n"
 "champs de formulaires.\n"
@@ -6129,9 +6120,9 @@ msgid ""
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
 "enabled.\n"
 msgstr ""
-"NOTE: certain format de document peuvent apparaître défigurés\n"
+"NB : certains formats de document peuvent apparaître défigurés\n"
 "lorsque \"LINKS_ARE_NUMBERED\" ou \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" \n"
-"sont sélectionnés.\n"
+"sont activés.\n"
 
 #: src/LYrcFile.c:873
 msgid ""
@@ -6178,17 +6169,20 @@ msgid ""
 "called \"lynx.cfg\".  It has different content and a different format.\n"
 "It is not this file.\n"
 msgstr ""
-"Valeurs implicites utilisateur - Lynx\n"
+"Fichier Lynx des valeurs par défaut de l'utilisateur\n"
 "\n"
 "Ce fichier contient des options enregistrées à partir du menu Paramètres\n"
 "(normalement à l'aide de la touche '>').  Il n'est pas nécessaire d'éditer\n"
 "ce fichier manuellement puisque les valeurs implicites peuvent être\n"
 "modifiées à partir du menu Paramètres; la prochaine fois que vous\n"
 "enregistrez les nouvelles valeurs dans ce ce menu, le fichier est\n"
-"complètement renouvelé.  Vous êtes prévenus...  Si vous cherchez le fichier\n"
+"complètement réécrit.  Vous êtes prévenus...  Si vous cherchez le fichier\n"
 "de configuration générale il s'appelle normalement lynx.cfg et il a un\n"
 "contenu et un format différents.  Ce n'est pas ce fichier.\n"
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "La lecture de la socket a échouée pour 180,000 essais"
+
 #~ msgid "reason unknown."
 #~ msgstr "raison inconnue"
 
diff --git a/po/hu.po b/po/hu.po
index 66ecef77..152002dd 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: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 2004-11-14 19:52+0100\n"
 "Last-Translator: Mihály Gyulai <gyulai@fbi.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -2159,7 +2159,7 @@ msgstr ""
 " Ide írhatja az üzenet szövegét."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2168,7 +2168,7 @@ msgstr ""
 " Mikor kész, nyomjon ENTER-t, és egy üres sorba írjon pontot (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2805,7 +2805,7 @@ msgstr "POST tartalommal rendelkezõ dokumentum nem található a gyorstárban. Újra
 msgid "Loading failed, use a previous copy."
 msgstr "A betöltés sikertelen, korábbi példány használata."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "A betöltés nem teljes."
 
@@ -2828,7 +2828,7 @@ msgstr "**** HTAccess: Visszatérési állapot: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Nem lehet elérni"
 
@@ -3033,7 +3033,7 @@ msgstr "A címben érvénytelen a port"
 msgid "Address length looks invalid"
 msgstr "A cím hosszúsága érvénytelen"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Nem találom a %s távoli számítógépet."
@@ -3042,40 +3042,41 @@ msgstr "Nem találom a %s távoli számítógépet."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "A %s helytelen gépnév"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%s csatlakozás létrehozása ide: %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "az illesztõpont sérült."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "az illesztõpont sérült: család: %d cím: %s port: %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Nem sikerült a nem blokkolt csatlakozás."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "A kapcsolat sikertelen (túl sok próbálkozás)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Nem lehet visszaállítani az illesztõpontot blokkoltra."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "Az illesztõpont 180.000 olvasás után is sikertelen."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "A kapcsolat sikertelen (túl sok próbálkozás)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3492,34 +3493,34 @@ msgstr "kulcsgeneráló mezõ"
 msgid "unknown form field"
 msgstr "ismeretlen ûrlap mezõ"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "Nem lehet megnyitni a fájlt a feltöltéshez"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "%s továbbítása"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Akadásjelzés: A TextAnchor szerkezete sérült - javaslom a megszakítást!"
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Tördeljem a sorokat, hogy kiférjenek?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "A hosszú sorokat új sorba tördeltem!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "A hosszú sorok végét levágtam!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "bájt"
 
@@ -3692,7 +3693,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "A fájl még helyreállítható innen: %s, ebben a folyamatban"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3701,23 +3702,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Nem lehet elérni a cgi alkalmazói programot"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Jó tanács"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Egy kitûnõ http szerver VMS-hez rendelkezésre áll"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "ezen a linken keresztül"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Nagyon jól támogatja a CGI szkripteket.\n"
 
@@ -3949,271 +3950,271 @@ msgstr "Hivatkozások"
 msgid "Visible links"
 msgstr "Látható hivatkozás"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Nem lehet a(z) %s állapotát meghatározni."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "A kiválasztott elem nem fájl vagy könyvtár! A kérés figyelmen kívül hagyva."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "A(z) %s nem végrehajtható, rendszerhiba miatt!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Valószínûleg sérült %s, rendszerhiba miatt!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "%s eltávolítása"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr "%s létrehozása"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "%s mozgatása ide: %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Ezen a néven már létezik egy könyvtár! A kérés figyelmen kívül hagyva."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Ezen a néven már létezik egy fájl! A kérés figyelmen kívül hagyva."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "A megadott név már használatban van! A kérés figyelmen kívül hagyva."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "A célnak más a tulajdonosa! Kérés megtagadva."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "A cél nem érvényes könyvtár! Kérés megtagadva."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Minden megjelölt fájl és könyvtár eltávolítása?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Kérem az új helyét a megjelölt elemeknek: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Az elérési út túl hosszú"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "A forrás és a cél ugyanaz az hely - figyelmen kívül hagyva!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Kérem az új könyvtárnevet: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Kérem az új fájlnevet: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Érvénytelen karaktert találtam (elérési út elválasztó)! Kérés figyelmen kívül hagyva."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Kérem a könyvtár új helyét: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Kérem a fájl új helyét: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Váratlan hiba - hiányzik a záró elérési út elválasztó"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "A forrás és a cél ugyanaz az hely - figyelmen kívül hagyva!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Név (N), hely (L) vagy jogok (P) módosítása:"
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Név (N) vagy hely (L) módosítása:"
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Ez a képesség még nincs készen!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Kérem a létrehozandó fájl nevét: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Érvénytelen átirányítás \"//\"! A kérés figyelmen kívül hagyva."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Kérem az új könyvtár nevét: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Fájl (F) vagy könyvtár (D) létrehozása: "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "'%s' könyvtár eltávolítása?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
 msgstr "Könyvtár eltávolítása?"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "'%s' fájl eltávolítása?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Fájl eltávolítása?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Eltávolítsam a %s szimbolikus hivatkozást?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Eltávolítsam a szimbolikus hivatkozást?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Sajnálom, nem tudom hogy kell engedélyezni a nem-UNIX fájlokat."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Nem lehet megnyitni az engedély beállítások fájlt"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Adja meg a jogosultságokat:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Tulajdonos:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Csoport"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "A többiek:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "engedélyezve"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Érvénytelen mód formátum."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Érvénytelen szintaktika."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Figyelmeztetés! UU-dekódolt fájl jön létre abban a könyvtárban, ahonnan elindította a Lynxet."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "ÜRES URL mutató"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "%s futtatása "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Rendszerparancs végrehajtása. Ez eltarthat egy ideig."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Aktuális könyvtár:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Jelenlegi kiválasztás:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Semmi nincs kiválasztva."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "jelölt elem:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "jelölt elemek:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Érvénytelen fájlnév; a kérés figyelmen kívül hagyva."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "A telepítés nincs engedélyezve a kiválasztott könyvtárba."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "A kiválasztott elem nem könyvtár! A kérés figyelmen kívül hagyva."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Egy pillanat, ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr "Hiba a telepítési paraméterek létrehozása során"
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "A forrás és a cél ugyanaz: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Már a cél könyvtárban van: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Telepítés kész"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "Az átmeneti URL vagy lista túl hosszú."
 
@@ -4252,19 +4253,19 @@ msgstr "Ez az üzenet önmûködõen jött létre"
 msgid "No system mailer configured"
 msgstr "Nincsen rendszerszintû levelezõ beállítva"
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Nem találtam Winsock-ot, sajnálom."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Önnek meg kell adnia egy érvényes TMP vagy TEMP területet"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Nincs ilyen könyvtár"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4275,7 +4276,7 @@ msgstr ""
 "A(z) %s konfigurációs fájl nem áll rendelkezésre.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4286,7 +4287,7 @@ msgstr ""
 "Nincs deklarált karakterkészlet a Lynx-ben.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4297,7 +4298,7 @@ msgstr ""
 "Nincs deklarált szerkesztõkép a Lynx-ben.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4308,68 +4309,68 @@ msgstr ""
 "A(z) %s Lynx-fájl nem áll rendelkezésre.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Figyelem:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "az állandó süti állapot csak a következõ folyamat során fog megváltozni."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "A Lynx figyelmen kívül hagyja a %s fel nem ismert karakterkészletet\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Verzió %s (%s)"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Készítve %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "A szerzõi és kiadó jogokat a Kansas Egyetem, a CERN és az egyéb közremûködõk gyakorolják."
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "A GNU Általános Nyilvános Licensz szerint kiadva."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Nézze meg a súgót és a http://lynx.isc.org/-ot, ahol segítséget kaphat."
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "HASZNÁLAT: %s [opciók] [fájl]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Opciók:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Érvénytelen opció: %s \n"
@@ -4398,7 +4399,7 @@ msgstr "Súgó képernyõ"
 msgid "System Index"
 msgstr "Rendszer index"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Belépés a fõképernyõbe"
 
@@ -4422,65 +4423,65 @@ msgstr "Az útvonal egy összetevõje nem könyvtár"
 msgid "failed to change directory"
 msgstr "nem sikerült a  könyvtárváltás"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "A dokumentumot átalakítom az aktuális beállításoknak megfelelõen..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Végzetes hiba: nem lehet megnyitni a(z) '%s' kimeneti fájlt\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr "'Táblázat középre' engedélyezve."
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr "'Táblázat középre' tiltva."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "Üres a pillanatnyi URL."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Sikertelen a vágólapra másolás."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "A dokumentum URL-jét a vágólapra tesszük."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "A link URL-jét a vágólapra tesszük."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "Nincsen URL a vágólapon."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Nincs kezdõfájl!"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: A kezdõfájlt nem találom (sem HTML szöveget, sem sima szöveget)"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Kilépés..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-tovább-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Ön levelet fog küldeni:"
 
@@ -4488,7 +4489,7 @@ msgstr "Ön levelet fog küldeni:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4502,7 +4503,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4512,7 +4513,7 @@ msgstr ""
 "\n"
 " Adja meg vagy szerkessze a fejléc \"Tárgy:\" sorát\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4525,7 +4526,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4535,7 +4536,7 @@ msgstr ""
 "\n"
 " Kérem írja be az üzenetet ez alá."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Az üzenetben nincs eredeti szöveg!"
 
@@ -5189,38 +5190,38 @@ msgstr "Nem tud elindulni, a CERN szabály fájlja nem áll rendelkezésre (%s)\n"
 msgid "(no name)"
 msgstr "(névtelen)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Több mint %d egymásba-ágyazást találtam a lynx.cfg-ben -- hurok alakult ki???\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Az utolsó beillesztés %s volt,\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "beszúrva innen: %s.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Az itt következõk a lynx.cfg fájlban olvashatók."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Kérem olvassa el az ide vonatkozó leírást ("
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr ") további információért."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "VÁLTOZÁSOK ÚJRATÖLTÉSE"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Az elsõdleges beállítás:"
 
@@ -5256,187 +5257,187 @@ msgstr "A kiválasztott elem"
 msgid "Full name:"
 msgstr "Teljes név:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Nem tudom követni a linket"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Erre a fájlra mutat:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Tulajdonos neve:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Csoport neve:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Fájl méret:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr "(bájt)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Létrehozás dátuma:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Utolsó módosítás:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Utolsó hozzáférés:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Elérési jogok"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr "Csoport"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr "Világ:"
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Az aktuális fájl"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Hivatkozásnév:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Karakterkészlet:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr "(feltételezett)"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Kiszolgáló:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Dátum:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Utolsó módosítás:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr "Lejár:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Gyorstár vezérlés:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Tartalom hossz:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 #, fuzzy
 msgid "Length:"
 msgstr "Tartalom hossz:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Nyelv:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "Elküldött adat:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "Elküldött tartalom-típus:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Tulajdonos:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "méret:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "sor"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "ûrlap mód"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "forrás"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normál"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", biztonságos"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", belsõ hivatkozáson keresztül"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", gyorstár nélkül"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", ISMAP parancsállomány"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", könyvjelzõ fájl"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "mód:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Az aktuális link"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Módszer:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Kódolás típusa:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr "Mûvelet:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Ûrlap mezõ)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Nincs hivatkozás ezen a lapon"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr "Kiszolgáló fejléc:"
 
@@ -5489,33 +5490,33 @@ msgstr "Feltöltés:"
 msgid "Upload options:"
 msgstr "Feltöltési beállítások:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr "A letöltendõ dokumentum URL-jét a vágólapra tesszük."
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Nem támogatott elérési protokoll ezen az URL sémán."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "Túl sok átmeneti fájl"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "ismeretlen szigorítás"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Nincs szigorítás beállítva.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Szigorítási beállítás:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "Nem találom a HOME könyvtárat"
 
@@ -6090,5 +6091,8 @@ msgstr ""
 #~ msgid "History List maximum reached!  Document not pushed."
 #~ msgstr "Elértük az elõzménylista maximális hosszát! A dokumentum nem lett berakva."
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "Az illesztõpont 180.000 olvasás után is sikertelen."
+
 #~ msgid "reason unknown."
 #~ msgstr "ok ismeretlen."
diff --git a/po/it.po b/po/it.po
index 0981463b..771b9140 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: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\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"
@@ -2196,7 +2196,7 @@ msgstr ""
 " Immettere il messaggio qui di seguito."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2205,7 +2205,7 @@ msgstr ""
 " Una volta terminato, premere INVIO e mettere un singolo punto (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2868,7 +2868,7 @@ msgstr "Documento con contenuto POST non trovato in memoria. Ritentare?"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Caricamento incompleto."
 
@@ -2891,7 +2891,7 @@ msgstr "**** HTAccess: stato di ritorno: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Accesso impossibile"
 
@@ -3096,7 +3096,7 @@ msgstr "L'indirizzo ha un numero di porta non valido."
 msgid "Address length looks invalid"
 msgstr "La lunghezza dell'indirizzo sembra non valida"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Impossibile individuare l'host remoto %s"
@@ -3105,41 +3105,42 @@ 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:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, 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:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Connessione %s a %s "
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "socket fallita."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, 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:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Impossibile stabilire connessione non bloccante."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "Connessione fallita (troppi tentativi)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Impossibile ripristinare socket bloccante."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "Falliti 180000 tentativi di lettura socket."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Connessione fallita (troppi tentativi)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3563,34 +3564,34 @@ msgstr "campo di modulo sconosciuto"
 
 # WWW/Libary/Implementation/HTFile.c
 # #, fuzzy
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "Impossibile aprire il file per il caricamento"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Invio di %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Interruzione: struttura TextAnchorrovinata - si suggerisce di abbandonare!"
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Accorciare le righe per adattarle all'area di visualizzazione?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Le righe molto lunghe sono state spezzate!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "Le righe molto lunghe sono state troncate!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "byte"
 
@@ -3766,7 +3767,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Il file si potrà recuperare da %s entro questa sessione."
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3775,23 +3776,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Impossibile accedere allo script cgi"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Buon consiglio"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Un ottimo server http per VMS è disponibile tramite"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "questo link"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Esso offre il supporto per gli script CGI al miglior livello attuale.\n"
 
@@ -4026,273 +4027,273 @@ msgstr "Riferimenti"
 msgid "Visible links"
 msgstr "Link visibili"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Impossibile rilevare lo stato di '%s'."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "L'elemento selezionato non è né un file né una directory! Richiesta ignorata."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Operazione %s impossibile per errore di sistema!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Insuccesso di %s in seguito a un probabile errore di sistema"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "eliminazione di %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr "touch %s"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "spostamento di %s a %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Questa directory esiste già! Richiesta ignorata."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Questo file esiste già! Richiesta ignorata."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Il nome indicato è già usato! Richiesta ignorata."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "La destinazione ha un proprietario diverso! Richiesta negata."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "La destinazione non è una directory valida! Richiesta negata."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Eliminare tutte le directory e i file contrassegnati?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Immettere una nuova destinazione per le voci contrassegnate: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Percorso troppo lungo"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Origine e destinazione sono identici - richiesta ignorata!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Scrivere un nuovo nome per la directory: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Scrivere un nuovo nome per il file: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Carattere proibito (separatore di percorso)! Richiesta ignorata."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Immettere una nuova destinazione per la directory: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Immettere una nuova destinazione per il file: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Errore inatteso - non trovo il separatore di percorso finale"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Origine e destinazione sono identici! Richiesta ignorata!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Modificare nome, locazione o diritti di accesso (n, l o p): "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Modificare nome o locazione (n o l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Questa caratteristica non è ancora disponibile."
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Scrivere il nome del file da generare: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Reindirizzamento \"//\" proibito! Richiesta ignorata."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Scrivere il nome della nuova directory: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Generare un file o una directory (f o d): "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, fuzzy, c-format
 msgid "Remove directory '%s'?"
 msgstr "Eliminare il file '%s'?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
 msgstr " directory"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Eliminare il file '%s'?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Eliminare il file?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Eliminare il link simbolico '%s'?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Eliminare il link simbolico?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Impossibile gestire i diritti di accesso per i file non UNIX."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Impossibile aprire il file delle opzioni di permesso."
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Specificare di seguito i diritti di accesso:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Proprietario:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Altri:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "modulo di permesso"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Formato di modo non valido."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Formato di sintassi non valido."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Nota: il file UUDecoded sarà nella directory in cui è stato avviato Lynx."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "puntatore a NULL URL"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Esecuzione di %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Esecuzione di comando di sistema. Potrebbe volerci un po' di tempo."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Directory attuale:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Selezione attuale:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Nulla attualmente selezionato."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "voce contrassegnata:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "voci contrassegnate:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Nome di file proibito; richiesta ignorata."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Manca il diritto per l'installazione nella directory selezionata."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "La voce selezionata non è una directory! Richiesta ignorata."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Solo un momento..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 #, fuzzy
 msgid "Error building install args"
 msgstr "Errore nella preparazione degli argomenti di installazione."
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Origine e destinazione sono identici: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Siamo già nella directory destinazione: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Installazione terminata."
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "L'URL o l'elenco temporaneo sarebbero troppo lunghi."
 
@@ -4331,20 +4332,20 @@ msgstr "Questo messaggio è stato generato automaticamente da"
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Nessun Winsock trovato, spiacente."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 #, fuzzy
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "SI DEVE definire un'area TMP o TEMP valida! \n"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Non esiste la directory indicata"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4356,7 +4357,7 @@ msgstr ""
 "\n"
 
 # src/LYMain.c
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4367,7 +4368,7 @@ msgstr ""
 "Insiemi di caratteri di Lynx non precisati.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4378,7 +4379,7 @@ msgstr ""
 "Edit map di Lynx non precisata.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4389,71 +4390,71 @@ msgstr ""
 "Il file Lynx %s non è disponibile.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Attenzione:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 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:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignorato charset=%s sconosciuto.\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s versione %s (%s)\n"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Compilato il %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Copyright dell'Università del Kansas, del CERN e di altri collaboratori.\n"
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Distribuito nell'ambito della licenza pubblica GNU\n"
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 #, fuzzy
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 "Vedere http://lynx.browser.org/ e l'aiuto in linea per ulteriori informazioni.\n"
 "\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "USO: %s [opzioni] [file]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Le opzioni sono:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: opzione non valida: %s\n"
@@ -4482,7 +4483,7 @@ msgstr "Schermata di aiuto"
 msgid "System Index"
 msgstr "Indice sistema"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Ingresso nella pagina di avvio"
 
@@ -4506,66 +4507,66 @@ msgstr "Un elemento del percorso non è una directory."
 msgid "failed to change directory"
 msgstr "cambiamento directory fallito"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Reanalisi del documento con le impostazioni attuali..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Errore grave: impossibile aprire il file di uscita %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 #, fuzzy
 msgid "Current URL is empty."
 msgstr "Directory attuale:"
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-indice-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: impossibile accedere al file di avvio"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: file di avvio non trovato o non avente formato text/html o text/plain"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Uscita..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-segue-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Il contributo sarà inviato a: "
 
@@ -4573,7 +4574,7 @@ msgstr "Il contributo sarà inviato a: "
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4587,7 +4588,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4597,7 +4598,7 @@ msgstr ""
 "\n"
 " Immettere o correggere l'intestazione Subject:\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4610,7 +4611,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4620,7 +4621,7 @@ msgstr ""
 "\n"
 "Immettere il messaggio qui di seguito:"
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Il messaggio non ha testo originale!"
 
@@ -5296,38 +5297,38 @@ msgstr "Lynx: impossibile iniziare. File di regole CERN %s non disponibile.\n"
 msgid "(no name)"
 msgstr "(nessun nome)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, 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:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "L'ultima inclusione tentata era: '%s',\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "incluso da '%s'.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Quanto segue è tratto dal file lynx.cfg personale."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Consultare la distribuzione"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "per ulteriori commenti."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "RIACQUISIRE LE MODIFICHE"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "La configurazione principale"
 
@@ -5363,27 +5364,27 @@ msgstr "Voce attualmente selezionata"
 msgid "Full name:"
 msgstr "Nome completo:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Impossibile attivare il link"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Punta al file:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Nome del proprietario:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Nome del gruppo:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Lunghezza file:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 #, fuzzy
 msgid "(bytes)"
 msgstr "byte"
@@ -5391,164 +5392,164 @@ msgstr "byte"
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Data di creazione:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Ultimo aggiornamento:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Ultimo accesso:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Diritti di accesso"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 #, fuzzy
 msgid "Group:"
 msgstr "Gruppo"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "File attualmente visualizzato"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Nome del link:"
 
 # NdT May be this translation is too long
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Set di caratteri:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Data:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Ultima mod:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 #, fuzzy
 msgid "Expires:"
 msgstr "&nbsp;Scade:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Controllo cache:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Lunghezza contenuto:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 #, fuzzy
 msgid "Length:"
 msgstr "Lunghezza contenuto:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Lingua:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "Dati POST:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "Tipo di contenuto POST :"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Proprietario/i:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "grandezza:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "Righe"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "tipo modulo"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "origine"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normale"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", protetto"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", collegato internamente"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", nessuna cache"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", script ISMAP"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", file dei bookmark"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "Modo:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Link attualmente selezionato"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Metodo:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Codifica:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 #, fuzzy
 msgid "Action:"
 msgstr "Posizione: "
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(campo del modulo)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Nessun link nella pagina attuale"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 #, fuzzy
 msgid "Server Headers:"
 msgstr "Server:"
@@ -5602,34 +5603,34 @@ msgstr "Caricare su:"
 msgid "Upload options:"
 msgstr "Opzioni di caricamento file:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Protocollo di accesso inatteso per questo schema di URL."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "Troppi file temporanei"
 
 # #, fuzzy
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "Restrizione ignota"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Nessuna restrizione impostata.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Descrizione delle restrizioni:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr ""
 
@@ -6213,6 +6214,9 @@ msgstr ""
 #~ msgid "History List maximum reached!  Document not pushed."
 #~ msgstr "L'elenco della storia ha raggiunto il massimo. Documento non inserito."
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "Falliti 180000 tentativi di lettura socket."
+
 #~ msgid "Short read from file, problem?"
 #~ msgstr "Lettura breve del file, problemi?"
 
diff --git a/po/lynx.pot b/po/lynx.pot
index 990a79bc..23e59ff7 100644
--- a/po/lynx.pot
+++ b/po/lynx.pot
@@ -1,9 +1,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.7dev.9\n"
+"Project-Id-Version: lynx 2.8.7dev.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\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"
@@ -2162,14 +2162,14 @@ msgid ""
 msgstr ""
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
 msgstr ""
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2793,7 +2793,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr ""
 
@@ -2818,7 +2818,7 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr ""
 
@@ -3017,8 +3017,8 @@ msgstr ""
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1607
-#: WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618
+#: WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -3027,40 +3027,40 @@ msgstr ""
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622
+#: WWW/Library/Implementation/HTTCP.c:1633
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
+#: WWW/Library/Implementation/HTTCP.c:2016
+msgid "Socket read failed (too many tries)."
 msgstr ""
 
 #: WWW/Library/Implementation/HTTP.c:84
@@ -3466,34 +3466,34 @@ msgstr ""
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr ""
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr ""
 
@@ -3652,7 +3652,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr ""
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3661,23 +3661,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr ""
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr ""
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr ""
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr ""
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr ""
 
@@ -3901,271 +3901,271 @@ msgstr ""
 msgid "Visible links"
 msgstr ""
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr ""
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr ""
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr ""
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr ""
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr ""
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr ""
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr ""
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr ""
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr ""
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr ""
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr ""
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr ""
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr ""
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr ""
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr ""
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr ""
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr ""
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr ""
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
 msgstr ""
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr ""
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr ""
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr ""
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr ""
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr ""
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr ""
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr ""
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr ""
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr ""
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr ""
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr ""
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr ""
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr ""
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr ""
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr ""
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr ""
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr ""
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr ""
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr ""
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr ""
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr ""
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr ""
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr ""
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr ""
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr ""
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr ""
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr ""
 
@@ -4204,19 +4204,19 @@ msgstr ""
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr ""
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr ""
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr ""
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4224,7 +4224,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4232,7 +4232,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4240,7 +4240,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4248,66 +4248,66 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr ""
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr ""
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr ""
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr ""
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
@@ -4336,7 +4336,7 @@ msgstr ""
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr ""
 
@@ -4360,65 +4360,65 @@ msgstr ""
 msgid "failed to change directory"
 msgstr ""
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr ""
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr ""
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr ""
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr ""
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr ""
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr ""
 
@@ -4426,7 +4426,7 @@ msgstr ""
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4437,14 +4437,14 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
 " Please provide or edit the Subject: header\n"
 msgstr ""
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4454,14 +4454,14 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
 " Please enter your message below."
 msgstr ""
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr ""
 
@@ -5109,38 +5109,38 @@ msgstr ""
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr ""
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr ""
 
@@ -5176,186 +5176,186 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr ""
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr ""
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr ""
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr ""
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr ""
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr ""
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr ""
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr ""
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr ""
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr ""
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr ""
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr ""
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr ""
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr ""
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr ""
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr ""
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr ""
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr ""
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr ""
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr ""
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr ""
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr ""
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr ""
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr ""
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr ""
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr ""
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr ""
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr ""
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ""
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ""
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ""
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ""
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ""
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr ""
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr ""
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr ""
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr ""
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr ""
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr ""
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr ""
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr ""
 
@@ -5402,33 +5402,33 @@ msgstr ""
 msgid "Upload options:"
 msgstr ""
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr ""
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr ""
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 53d0af7b..b30fc317 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx-2.8.7-dev9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 2008-07-13 15:30+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -2161,7 +2161,7 @@ msgstr ""
 " Schrijf uw bericht hieronder."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2170,7 +2170,7 @@ msgstr ""
 " Wanneer u klaar bent, druk dan op <Enter> en plaats vervolgens"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2805,7 +2805,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:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Laden niet voltooid."
 
@@ -2828,7 +2828,7 @@ msgstr "**** HTAccess: Geretourneerde status was: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Kan geen toegang krijgen"
 
@@ -3032,7 +3032,7 @@ msgstr "Adres bevat ongeldige poort"
 msgid "Address length looks invalid"
 msgstr "Adreslengte ziet er ongeldig uit"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Kan gindse computer %s niet vinden."
@@ -3041,40 +3041,41 @@ msgstr "Kan gindse computer %s niet vinden."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ongeldige hostnaam %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Maken van %s-verbinding met %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "socket is mislukt."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, 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:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Kan verbinding niet niet-blokkerend maken."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "Verbinden is mislukt (te vaak opnieuw geprobeerd)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Kan socket niet naar blokkerende modus herstellen."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "Lezen uit socket is mislukt na 180 duizend (!) pogingen."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Verbinden is mislukt (te vaak opnieuw geprobeerd)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3489,34 +3490,34 @@ msgstr "sleutelaanmaakveld"
 msgid "unknown form field"
 msgstr "onbekend formulierveld"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "Kan bestand niet openen voor upload"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Verzenden van %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 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:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Regels omvouwen zodat alles zichtbaar is?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Erg lange regels zijn omgevouwen!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "Erg lange regels zijn afgekapt!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "bytes"
 
@@ -3691,7 +3692,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Het bestand is gedurende deze sessie wellicht terug te halen uit %s"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Wilt u \"%s\" uitvoeren?"
@@ -3700,23 +3701,23 @@ msgstr "Wilt u \"%s\" uitvoeren?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Geen toegang tot cgi script"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Goede Raad"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Een uitstekende http server voor VMS is bereikbaar via"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "deze link"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Het biedt voortreffelijke CGI script ondersteuning.\n"
 
@@ -3949,271 +3950,271 @@ msgstr "Referenties"
 msgid "Visible links"
 msgstr "Zichtbare links"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Kan status van '%s' niet opvragen."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Het geselecteerde item is geen bestand of map!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Het %s is mislukt vanwege systeemfout!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Waarschijnlijke fout tijdens het %s vanwege systeemfout!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "verwijderen van %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr "aanraken van %s"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "verplaatsen van %s naar %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Er is al een map met die naam!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Er is al een bestand met die naam!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "De opgegeven naam is al in gebruik!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "Bestemming heeft een andere eigenaar!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Bestemming is geen geldige map!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Alle aangevinkte bestand en mappen verwijderen?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Voer een nieuwe bestemming in voor aangevinkte items: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Pad is te lang"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Bron en bestemming zijn dezelfde locatie -- verzoek is genegeerd!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Voer een nieuwe naam in voor map: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Voer een nieuwe naam in voor bestand: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Ongeldig teken (padscheidingsteken) gevonden!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Voer een nieuwe locatie in voor map: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Voer een nieuwe locatie voor bestand in: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Onverwachte mislukking - kan nakomend padscheidingsteken niet vinden"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Bron en bestemming zijn dezelfde locatie!  Verzoek is genegeerd!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Wijzig N)aam, L)ocatie, of P)ermissies (n,l, of p): "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Wijzig N)aam of L)ocatie (n of l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Deze optie is nog niet geïmplementeerd!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Voer een bestandsnaam in om aan te maken: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Foutieve verwijzing \"/\"gevonden!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Voer een naam in voor een nieuwe map: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Maak F)-bestand of D)-map (f of d): "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Map '%s' verwijderen?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
 msgstr "Map verwijderen?"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Verwijder bestand '%s'?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Verwijder bestand?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Verwijder symbolische koppeling '%s'?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Verwijder symbolische koppeling?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Sorry, weet nog niet hoe met permissies van niet-UNIX bestanden om te gaan."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Kan bestand met permissie-opties niet openen"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Specificeer permissies hieronder:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Eigenaar:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Groep"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Anderen:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "formulier voor permissies"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Onjuist formaat voor modus."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Onjuiste syntaxis."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Let op!  UUDecoded bestand blijft bestaan in de map waarin u Lynx startte."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "NULL URL verwijzing"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Bezig met uitvoeren van %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Bezig met uitvoeren van systeemcommando.  Dit kan even duren."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Huidige map:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Geselecteerd:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Er is momenteel niets geselecteerd."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "aangevinkt item:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "aangevinkte items:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Onjuiste bestandsnaam; verzoek is genegeerd."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Installatie in de geselecteerde map is niet toegestaan."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Het geselecteerde item is geen map!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Een ogenblik geduld..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr "Fout bij opbouwen van installatie-argumenten"
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Bron en bestemming zijn gelijk: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Al in bestemmingsmap: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Installatie is voltooid"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "Tijdelijke URL of lijst zou te lang zijn."
 
@@ -4252,19 +4253,19 @@ msgstr "Dit bericht is automatisch gegenereerd door"
 msgid "No system mailer configured"
 msgstr "Geen systeemmailer geconfigureerd"
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Geen Winsock gevonden, sorry."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "U MOET een geldig TMP- of TEMP-gebied opgeven!"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Map bestaat niet"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4275,7 +4276,7 @@ msgstr ""
 "Configuratiebestand '%s' is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4286,7 +4287,7 @@ msgstr ""
 "Lynx-tekensets zijn niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4297,7 +4298,7 @@ msgstr ""
 "Lynx-editkaart is niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4308,66 +4309,66 @@ msgstr ""
 "Lynx-bestand '%s' is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Er zijn %d tekens van standaardinvoer genegeerd.\n"
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Gebruik \"-stdin\" of \"-\" om aan te geven hoe doorgesluisde invoer behandeld moet worden.\n"
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 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:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: onbekende tekenset '%s' wordt genegeerd\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s versie %s (%s)"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Gecompileerd op %s op %s om %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "De auteursrechten zijn in handen van de Lynx-ontwikkelaarsgroep,"
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "de Universiteit van Kansas, CERN, en andere medewerkers."
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Gedistribueerd onder de GPL (GNU General Public License), versie 2."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 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:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Gebruik:  %s [opties] [bestand]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Mogelijke opties zijn:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ongeldige optie: %s\n"
@@ -4396,7 +4397,7 @@ msgstr "Hulpscherm"
 msgid "System Index"
 msgstr "Systeemindex"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Ingang naar beginscherm"
 
@@ -4420,65 +4421,65 @@ msgstr "Een component van het pad is geen map"
 msgid "failed to change directory"
 msgstr "Map wijzigen is mislukt"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Document wordt opnieuw ontleed met huidige instellingen..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatale fout: kan uitvoerbestand %s niet openen\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr "TABLE centreren ingeschakeld."
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr "TABLE centreren uitgeschakeld."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "Huidige URL is leeg."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Kopiëren naar klembord is mislukt."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "Document-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "Link-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "Geen URL op het klembord."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Geen toegang tot startbestand"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Startbestand kan niet gevonden worden of is geen tekst/html of tekst/plain"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Afsluiten..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-meer-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "U zult posten naar:"
 
@@ -4486,7 +4487,7 @@ msgstr "U zult posten naar:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4500,7 +4501,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4510,7 +4511,7 @@ msgstr ""
 "\n"
 " Geef of wijzig de 'Subject:'-kopregel (Onderwerp)\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4523,7 +4524,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4533,7 +4534,7 @@ msgstr ""
 "\n"
 " Schrijf hieronder uw bericht."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Bericht bevat geen oorspronkelijke tekst!"
 
@@ -5186,38 +5187,38 @@ msgstr "Lynx: kan niet starten, CERN reglement bestand %s is niet beschikbaar\n"
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Meer dan %d geneste insluitingen in lynx.cfg -- misschien een lus?!?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "De laatst geprobeerde insluiting was '%s',\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "ingevoegd vanuit '%s'.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Onderstaande gegevens werden gelezen uit uw lynx.cfg-bestand."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Lees de meegeleverde versie van"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "voor meer opmerkingen."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "DE VERANDERINGEN HERLADEN"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Uw primaire instellingenbestand is:"
 
@@ -5253,186 +5254,186 @@ msgstr "Geselecteerd item"
 msgid "Full name:"
 msgstr "Volledige naam:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "De verwijzing kan niet vervolgd worden"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Wijst naar bestand:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Naam van eigenaar:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Groepsnaam:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Bestandsgrootte:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr "(bytes)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Aanmaakdatum:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Laatst gewijzigd op:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Laatst bezocht op:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Toegangsrechten"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr "Groep:"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr "Wereld:"
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Het bestand dat u op dit moment bekijkt"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Linknaam:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Tekenset:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr "(verondersteld)"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Laatst veranderd:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr "Vervalt:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Cache-besturing:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Inhoudslengte:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr "Lengte:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Taal:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "POST-informatie:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "POST-inhoudstype:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Eigenaar:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "grootte:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "regels"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "formuliermodus"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "bron"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normaal"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", veilig"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", via interne link"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", geen cache"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", ISMAP-script"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", boekenleggerbestand"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "modus:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Link die nu geselecteerd is"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr "Actie:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(formulierveld)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Er zijn geen verwijzingen op de huidige pagina"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr "Serverkopregels:"
 
@@ -5485,33 +5486,33 @@ msgstr "Zenden naar:"
 msgid "Upload options:"
 msgstr "Zendopties:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr "Document afhalings-URL op klembord geplaatst."
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Onverwacht toegangsprotocol voor deze URL-methode."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "Te veel tijdelijke bestanden"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "Onbekende beperking"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Er zijn geen beperkingen gesteld.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Gestelde beperkingen:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "Kan persoonlijke map niet vinden"
 
@@ -6099,6 +6100,9 @@ msgstr ""
 "meestal lynx.cfg, en het heeft andere inhoud en een andere opmaak.\n"
 "Het is niet dit bestand.\n"
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "Lezen uit socket is mislukt na 180 duizend (!) pogingen."
+
 #~ msgid "History List maximum reached!  Document not pushed."
 #~ msgstr "Maximum lengte van Historielijst is bereikt!  Document is niet toegevoegd."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 21cc3fe7..c53f1e61 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 1999-07-30 09:47-03:00\n"
 "Last-Translator: Ricardo Soares Guimarães <ricardo@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -2174,7 +2174,7 @@ msgstr ""
 " Por favor entre com sua mensagem abaixo."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2183,7 +2183,7 @@ msgstr ""
 " Quando você terminar, pressione enter e aguarde alguns instantes."
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2828,7 +2828,7 @@ msgstr "Documento com ação de postagem não encontrado no cache. Reenviar?"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Leitura incompleta"
 
@@ -2851,7 +2851,7 @@ msgstr "HTAccess: Retorno de estado foi: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Não foi possível acessar"
 
@@ -3057,7 +3057,7 @@ msgstr "Comprimento do endereço parece estar errado"
 msgid "Address length looks invalid"
 msgstr "Comprimento do endereço parece estar errado"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Imposs;ivel localizar servidor remoto %s."
@@ -3066,40 +3066,41 @@ 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:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Servidor inválido %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, fuzzy, c-format
 msgid "Making %s connection to %s"
 msgstr "Conectando com %s em %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "Falha na conecção do socket."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Não foi possível criar conecção."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 #, fuzzy
 msgid "Connection failed (too many retries)."
 msgstr "Conecção falhou apos 180,000 tentativas."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Impossível restaurar socket para blocagem."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
 msgstr "Leitura do socket falhou após 180,000 tentativas."
 
 #: WWW/Library/Implementation/HTTP.c:84
@@ -3517,35 +3518,35 @@ msgstr "Campo de 'chave'"
 msgid "unknown form field"
 msgstr "Campo desconhecido"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Impossível abrir arquivo de saída! Cancelando!"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Enviando %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "bytes"
 
@@ -3716,7 +3717,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr ""
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3725,23 +3726,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Impossível acessar script CGI"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Conselho útil"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Um excelente servidor de HTTP para VMS está dispinível via"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "esta ligação"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Provê o estado do suporte a scripts CGI\n"
 
@@ -3976,112 +3977,112 @@ msgstr "Referências"
 msgid "Visible links"
 msgstr "Ligações visíveis"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Impossível pegar estado de '%s'."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "O ítem selecionado não é um diretório ou arquivo! Requisição ignorada."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Impossível executar %s em razão de falha do sistema!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Falha possível em %s devido a falha do sistema!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "remove %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr ""
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "move %s para %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Já existe um diretório com este nome! Requisição ignorada."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Já existe um arquivo com este nome! Requisição ignorada."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "O nome especificado já está em uso! Requisição ignorada."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "Destino tem um dono difwerente! Requisição impedida."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Destino não é um diretório válido! Requisição impedida."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 #, fuzzy
 msgid "Remove all tagged files and directories?"
 msgstr "Remove todos os diretórios e arquivos marcados"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Entre com novo local para itens marcados:"
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Caminho muito grande"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Fonte e destino são o mesmo local - requisição impedida!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Entre com o novo nome para o diretório:"
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Entre com o novo nome do arquivo:"
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 #, fuzzy
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Caractere inválido \"/\" encontrado! requisição ignorada."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Entre com novo local para o diretório:"
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Entre com novo local para o arquivo:"
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 #, fuzzy
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Falha inexperada - Impossível encontrar caminho \"/\""
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Fonte e destino são o mesmo local! Requisição ignorada!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Modifica nome, local, ou permissão (n,l,p):"
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 #, fuzzy
 msgid "Modify name or location (n or l): "
 msgstr "Modifica nome ou local (n,l):"
@@ -4089,165 +4090,165 @@ msgstr "Modifica nome ou local (n,l):"
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Esta propriedade não foi implementada ainda!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Entre com o nome do arquivo a ser criado:"
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Redirecionamento ilegal \"//\" encontrado! Requisição ignorada."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Entre com o nome para o novo diretório:"
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Criar 'f' arquivo ou 'd' diretório (f ou d):"
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, fuzzy, c-format
 msgid "Remove directory '%s'?"
 msgstr "Remove arquivo '%s':"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
 msgstr " diretório"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, fuzzy, c-format
 msgid "Remove file '%s'?"
 msgstr "Remove arquivo '%s':"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 #, fuzzy
 msgid "Remove file?"
 msgstr "Remove arquivo:"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, fuzzy, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Remove uma ligação simbólcia '%s':"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 #, fuzzy
 msgid "Remove symbolic link?"
 msgstr "Remove ligação simbólica:"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Desculpe, não sei como permitir arquivos não-UNIX ainda."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Impossível abrir arquivo de opções de permissão"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Especifique as permissões abaixo:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Dono:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Grupo"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Outros:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "forma como permitir"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Formato de modo inválido"
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Formato da sintaxe inválido."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Atenção! UUDecodificação ficará no diretório onde você chamou o Lynx."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "Ponteiro de URL vazio"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Executando %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Executando comando de sistema. Isto pode demorar um pouco."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Diretório corrente:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Seleção corrente:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Nada foi selecionado."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "item marcado:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "itens marcados:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Nome de arquivo inválido. Requisição ignorada."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Instalação no diretório selecionado não é possivel."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "O item selecionado não é um diretório. Requisição ignorada."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Só um momento..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr ""
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr ""
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, fuzzy, c-format
 msgid "Already in target directory: %s"
 msgstr "Lendo diretório..."
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Instalação completa."
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "URL temporário ou lista podem estar muito longas."
 
@@ -4286,21 +4287,21 @@ msgstr "Esta mensagem foi gerada automaticamente por"
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Não foi encontrado o Winsock, desculpe."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 #, fuzzy
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Você deve definir uma área TMP ou TEMP válida!\n"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 #, fuzzy
 msgid "No such directory"
 msgstr " diretório"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4310,7 +4311,7 @@ msgstr ""
 "\n"
 "Arquivo %s de configuração não está disponível.\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4321,7 +4322,7 @@ msgstr ""
 "Não foi declarada uma coleção de caracteres Lynx.\n"
 " \n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4332,7 +4333,7 @@ msgstr ""
 "Editor de mapas Lynx não foi declarado.\n"
 " \n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4343,73 +4344,73 @@ msgstr ""
 "Arquivo Lynx %s não está disponível.\n"
 " \n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "O estado dos cookies permanentes será alterado na próxima seção."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr ""
 "\n"
 "Versão %s (%.*s)\n"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Criado em %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Copyrights mantidos pela University of Kansas, CERN, e outros colaboradores.\n"
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Distribuido pela GNU General Public License.\n"
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 #, fuzzy
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 "Veja http://lynx.browser.org/ e o help on-line para mais informações.\n"
 "\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "USO: %s [opções] [arquivo]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Opções são:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Opção inválida: %s\n"
@@ -4438,7 +4439,7 @@ msgstr "Tela de Ajuda"
 msgid "System Index"
 msgstr "Indexador de sistema"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Entrada na tela principal"
 
@@ -4465,67 +4466,67 @@ msgstr ""
 msgid "failed to change directory"
 msgstr "Impossível acessar diretório."
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Reinterpretando documento pelas opções atuais..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Erro fatal - não foi possível abrir arquivo %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 #, fuzzy
 msgid "Current URL is empty."
 msgstr "Diretório corrente:"
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 #, fuzzy
 msgid "-index-"
 msgstr " index"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Não foi possível acessar o arquivo principal"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Arquivo inicial não pode ser encontrado ou não é texto/HTML"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Saindo..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr ""
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Você estará postando para:"
 
@@ -4533,7 +4534,7 @@ msgstr "Você estará postando para:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4547,7 +4548,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4557,7 +4558,7 @@ msgstr ""
 "\n"
 "Por favor forneça ou edite o Assunto:\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4570,7 +4571,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4580,7 +4581,7 @@ msgstr ""
 "\n"
 "Por favor, entre com sua mensagem abaixo."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Mensagem não tem texto original!"
 
@@ -5255,38 +5256,38 @@ msgstr "Lynx: Impossível iniciar,CERN arquivo de regulamento %s não está disponí
 msgid "(no name)"
 msgstr "(sem nome)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Mais de %d aninhados nos arquivos incluídos do lynx.cfg -- talvez seja um loop???\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Ultimo arquivo incluso chamado foi '%s',\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "incluído a partir de '%s'\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "O seguinte foi lido em seu arquivo lynx.cfg."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Por favor veja a distribuição"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "para mais comentários."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "RELER AS ALTERAÇÕES"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Sua configuração inicial"
 
@@ -5322,28 +5323,28 @@ msgstr "Item que você acabou de selecionar"
 msgid "Full name:"
 msgstr "Nome Completo:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Impossível seguir link"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Ponteiros para o arquivo:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 #, fuzzy
 msgid "Name of owner:"
 msgstr "Nome do dono:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Nome do grupo:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Tamanho do arquivo:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 #, fuzzy
 msgid "(bytes)"
 msgstr "bytes"
@@ -5351,164 +5352,164 @@ msgstr "bytes"
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Data de criação:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Última modificação:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Último acesso:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Permissões de acesso"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 #, fuzzy
 msgid "Group:"
 msgstr "Grupo"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Arquivo que você está vendo atualmente."
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Nome da Ligação:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Mapa de caracteres:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Data:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Última modificação:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 #, fuzzy
 msgid "Expires:"
 msgstr "&nbsp;EXpira:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Controle de cache:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Content-Length:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 #, fuzzy
 msgid "Length:"
 msgstr "Content-Length:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Lingua:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "Data de postagem:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "Postar tipo de documento:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Dono(s):"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "Tamanho:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "linhas"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "modo do formulário"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "fonte"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", salvo"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 #, fuzzy
 msgid ", via internal link"
 msgstr ", ligação interna"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", sem cache"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", script ISMAP"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", arquivo de Livro de marcações"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "modo:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Ligação que você acabou de selecionar"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Metodo:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 #, fuzzy
 msgid "Action:"
 msgstr "Localização:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Campo de formulário)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Sem ligações na página atual"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 #, fuzzy
 msgid "Server Headers:"
 msgstr "Servidor:"
@@ -5562,34 +5563,34 @@ msgstr "Enviar para:"
 msgid "Upload options:"
 msgstr "Opções de envio de arquivos:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 #, fuzzy
 msgid "unknown restriction"
 msgstr "Campo ou ligacão desconhecidos."
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, fuzzy, c-format
 msgid "Restrictions set:\n"
 msgstr "Descrição:"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 3f908e22..b13d46e9 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: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\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"
@@ -2160,7 +2160,7 @@ msgstr ""
 " ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÎÉÖÅ ×ÁÛÅ ÓÏÏÂÝÅÎÉÅ."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2169,7 +2169,7 @@ msgstr ""
 " ëÏÇÄÁ ×ÓÅ ÇÏÔÏ×Ï, ÎÁÖÍÉÔÅ <××ÏÄ> É ÐÏÓÔÁרÔÅ ÅÄÉÎÓÔ×ÅÎÎÕÀ ÔÏÞËÕ (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2807,7 +2807,7 @@ msgstr "äÏËÕÍÅÎÔ Ó ÓÏÄÅÒÖÉÍÙÍ POST ÎÅ ÎÁÊÄÅÎ × ËÜÛÅ.  ðÏÓÌÁÔØ ÓÎÏ×Á?"
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "úÁÇÒÕÚËÁ ÚÁ×ÅÒÛÅÎÁ ÎÅ ÐÏÌÎÏÓÔØÀ."
 
@@ -2830,7 +2830,7 @@ msgstr "**** HTAccess: ÷ÏÚ×ÒÁÝÅÎÎÙÊ ÓÔÁÔÕÓ: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "îÅÔ ÄÏÓÔÕÐÁ"
 
@@ -3035,7 +3035,7 @@ msgstr "îÅ×ÅÒÎÙÊ ÐÏÒÔ Õ ÁÄÒÅÓÁ"
 msgid "Address length looks invalid"
 msgstr "äÌÉÎÁ ÁÄÒÅÓÁ ×ÙÇÌÑÄÉÔ ÎÅ×ÅÒÎÏÊ"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÂÎÁÒÕÖÉÔØ ÕÄÁÌÅÎÎÕÀ ÍÁÛÉÎÕ %s."
@@ -3044,40 +3044,41 @@ msgstr "îÅ ÕÄÁÅÔÓÑ ÏÂÎÁÒÕÖÉÔØ ÕÄÁÌÅÎÎÕÀ ÍÁÛÉÎÕ %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÍÁÛÉÎÙ %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s ÓÏÅÄÉÎÅÎÉÅ Ó %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "ÏÛÉÂËÁ ÓÏËÅÔÁ."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "ÏÛÉÂËÁ ÓÏËÅÔÁ: ÓÅÍÅÊÓÔ×Ï %d ÁÄÒÅÓ %s ÐÏÒÔ %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ (ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÏÐÙÔÏË)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÓÏËÅÔÁ × ÔÅÞÅÎÉÅ 180,000 ÐÏÐÙÔÏË."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "îÅ ÕÄÁÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ (ÓÌÉÛËÏÍ ÍÎÏÇÏ ÐÏÐÙÔÏË)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3493,34 +3494,34 @@ msgstr "ÐÏÌÅ keygen"
 msgid "unknown form field"
 msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ÐÏÌÅ ÆÏÒÍÙ"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ ÄÌÑ ÚÁÇÒÕÚËÉ!"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "ðÏÓÙÌËÁ %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "ðÅÒÅÎÅÓÔÉ ÓÔÒÏËÉ, ÞÔÏÂÙ ÐÏÐÁÓÔØ × ÏÂÌÁÓÔØ ÏÔÏÂÒÁÖÅÎÉÑ?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "ïÞÅÎØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ ÂÙÌÉ ÐÅÒÅÎÅÓÅÎÙ!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "ïÞÅÎØ ÄÌÉÎÎÙÅ ÓÔÒÏËÉ ÂÙÌÉ ÕÓÅÞÅÎÙ!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "ÂÁÊÔ"
 
@@ -3695,7 +3696,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "æÁÊÌ ÍÏÖÅÔ ÂÙÔØ ×ÏÓÓÔÁÎÏ×ÌÅÎ ÉÚ %s × ÔÅÞÅÎÉÅ ÜÔÏÇÏ ÓÅÁÎÓÁ"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3704,23 +3705,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "ïÛÉÂËÁ ÄÏÓÔÕÐÁ Ë cgi-ÓËÒÉÐÔÕ"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "èÏÒÏÛÉÊ ÓÏ×ÅÔ"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "ïÔÌÉÞÎÙÊ http ÓÅÒ×ÅÒ ÄÌÑ VMS ÄÏÓÔÕÐÅÎ ÞÅÒÅÚ"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "ÜÔÕ ÓÓÙÌËÕ"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "ðÒÅÄÏÓÔÁ×ÌÑÅÍÁÑ ÉÍ ÐÏÄÄÅÒÖËÁ CGI-ÓËÒÉÐÔÏ× Ñ×ÌÑÅÔÓÑ ÐÏÓÌÅÄÎÉÍ ÓÌÏ×ÏÍ ÔÅÈÎÉËÉ.\n"
 
@@ -3954,272 +3955,272 @@ msgstr "óÓÙÌËÉ"
 msgid "Visible links"
 msgstr "÷ÉÄÉÍÙÅ ÓÓÙÌËÉ"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÓÔÁÔÕÓ '%s'."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "÷ÙÂÒÁÎÎÙÊ ÜÌÅÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ÆÁÊÌÏÍ ÉÌÉ ËÁÔÁÌÏÇÏÍ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "îÅ ÕÄÁÅÔÓÑ %s ×ÓÌÅÄÓÔ×ÉÅ ÓÉÓÔÅÍÎÏÊ ÏÛÉÂËÉ!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "÷ÏÚÍÏÖÎÏ ÏÛÉÂËÁ %s ×ÓÌÅÄÓÔ×ÉÅ ÓÉÓÔÅÍÎÏÊ ÏÛÉÂËÉ!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "ÕÄÁÌÉÔØ %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr ""
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "ÐÅÒÅÍÅÓÔÉÔØ %s × %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "ëÁÔÁÌÏÇ Ó ÔÁËÉÍ ÉÍÅÎÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "æÁÊÌ Ó ÔÁËÉÍ ÉÍÅÎÅÍ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "õËÁÚÁÎÎÏÅ ÉÍÑ ÕÖÅ ÉÓÐÏÌØÚÕÅÔÓÑ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "æÁÊÌ ÎÁÚÎÁÞÅÎÉÑ ÉÍÅÅÔ ÄÒÕÇÏÇÏ ×ÌÁÄÅÌØÃÁ!  úÁÐÒÏÓ ÚÁÐÒÅÝÅÎ."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "æÁÊÌ ÎÁÚÎÁÞÅÎÉÑ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÒÁ×ÉÌØÎÙÍ ËÁÔÁÌÏÇÏÍ!  úÁÐÒÏÓ ÚÁÐÒÅÝÅÎ."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "õÄÁÌÉÔØ ×ÓÅ ÏÔÍÅÞÅÎÎÙÅ ÆÁÊÌÙ É ËÁÔÁÌÏÇÉ?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÒÁÓÐÏÌÏÖÅÎÉÅ ÄÌÑ ÏÔÍÅÞÅÎÎÙÈ ÜÌÅÍÅÎÔÏ×: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "ðÕÔØ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÊ"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "éÓÔÏÞÎÉË É ÐÕÔØ ÎÁÚÎÁÞÅÎÉÑ ÓÏ×ÐÁÄÁÀÔ - ÚÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÉÍÑ ÄÌÑ ËÁÔÁÌÏÇÁ: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÉÍÑ ÄÌÑ ÆÁÊÌÁ: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "îÁÊÄÅÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ (ÒÁÚÄÅÌÉÔÅÌØ ÐÕÔÉ)! úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÍÅÓÔÏ ÒÁÓÐÏÌÏÖÅÎÉÑ ÄÌÑ ËÁÔÁÌÏÇÁ: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "÷×ÅÄÉÔÅ ÎÏ×ÏÅ ÍÅÓÔÏ ÒÁÓÐÏÌÏÖÅÎÉÑ ÄÌÑ ÆÁÊÌÁ: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "îÅÏÖÉÄÁÎÎÁÑ ÏÛÉÂËÁ - ÎÅ ÕÄÁÅÔÓÑ ÎÁÊÔÉ ÚÁ×ÅÒÛÁÀÝÉÊ ÒÁÚÄÅÌÉÔÅÌØ ÐÕÔÉ"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "éÓÔÏÞÎÉË É ÐÕÔØ ÎÁÚÎÁÞÅÎÉÑ ÓÏ×ÐÁÄÁÀÔ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "éÚÍÅÎÉÔÅ ÉÍÑ, ÍÅÓÔÏ ÒÁÓÐÏÌÏÖÅÎÉÑ, ÉÌÉ ÐÒÁ×Á ÄÏÓÔÕÐÁ (n, l, ÉÌÉ p): "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "éÚÍÅÎÉÔØ ÉÍÑ ÉÌÉ ÍÅÓÔÏ ÒÁÓÐÏÌÏÖÅÎÉÑ (n ÉÌÉ l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "üÔÁ ×ÏÚÍÏÖÎÏÓÔØ ÅÝÅ ÎÅ ÒÅÁÌÉÚÏ×ÁÎÁ!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÓÏÚÄÁ×ÁÅÍÏÇÏ ÆÁÊÌÁ: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "îÁÊÄÅÎÏ ÎÅ×ÅÒÎÏÅ ÐÅÒÅÎÁÐÒÁ×ÌÅÎÉÅ! úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "÷×ÅÄÉÔÅ ÉÍÑ ÄÌÑ ÎÏ×ÏÇÏ ËÁÔÁÌÏÇÁ: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "óÏÚÄÁÔØ ÆÁÊÌ ÉÌÉ ËÁÔÁÌÏÇ (f ÉÌÉ d): "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, fuzzy, c-format
 msgid "Remove directory '%s'?"
 msgstr "õÄÁÌÉÔØ ÆÁÊÌ '%s'?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
 msgstr " ËÁÔÁÌÏÇ"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "õÄÁÌÉÔØ ÆÁÊÌ '%s'?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "õÄÁÌÉÔØ ÆÁÊÌ?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "õÄÁÌÉÔØ ÓÉÍ×ÏÌØÎÕÀ ÓÓÙÌËÕ '%s'?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "õÄÁÌÉÔØ ÓÉÍ×ÏÌØÎÕÀ ÓÓÙÌËÕ?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "éÚ×ÉÎÉÔÅ, ÐÏËÁ ÎÅ ÉÚ×ÅÓÔÎÏ, ËÁË ÕÓÔÁÎÁ×ÌÉ×ÁÔØ ÐÒÁ×Á ÄÏÓÔÕÐÁ ÄÌÑ ÎÅ-UNIX ÆÁÊÌÏ×."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "îÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ÆÁÊÌ Ó ÏÐÃÉÑÍÉ ÐÒÁ× ÄÏÓÔÕÐÁ"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "õËÁÖÉÔÅ ÎÉÖÅ ÐÒÁ×Á ÄÏÓÔÕÐÁ:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "÷ÌÁÄÅÌÅÃ:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "çÒÕÐÐÁ"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "äÒÕÇÉÅ:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÒÅÖÉÍÁ."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÓÉÎÔÁËÓÉÓÁ."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "÷ÎÉÍÁÎÉÅ! UU-ÄÅËÏÄÉÒÏ×ÁÎÎÙÊ ÆÁÊÌ ÂÕÄÅÔ × ËÁÔÁÌÏÇÅ, ÉÚ ËÏÔÏÒÏÇÏ ×Ù ÚÁÐÕÓÔÉÌÉ Lynx."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "NULL ÕËÁÚÁÔÅÌØ ÎÁ URL"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "÷ÙÐÏÌÎÅÎÉÅ %s"
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "÷ÙÐÏÌÎÅÎÉÅ ÓÉÓÔÅÍÎÏÊ ËÏÍÁÎÄÙ. üÔÏ ÍÏÖÅÔ ÚÁÎÑÔØ ×ÒÅÍÑ."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "ôÅËÕÝÉÊ ËÁÔÁÌÏÇ:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "ôÅËÕÝÉÊ ×ÙÂÏÒ:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "óÅÊÞÁÓ ÎÉÞÅÇÏ ÎÅ ×ÙÂÒÁÎÏ."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "ÏÔÍÅÞÅÎÎÙÊ ÜÌÅÍÅÎÔ:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "ÏÔÍÅÞÅÎÎÙÅ ÜÌÅÍÅÎÔÙ:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "îÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÆÁÊÌÁ; ÚÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "õÓÔÁÎÏ×ËÁ × ×ÙÂÒÁÎÎÙÊ ËÁÔÁÌÏÇ ÎÅ ÒÁÚÒÅÛÅÎÁ."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "÷ÙÂÒÁÎÎÙÊ ÜÌÅÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ!  úÁÐÒÏÓ ÉÇÎÏÒÉÒÏ×ÁÎ."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "íÉÎÕÔËÕ ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr ""
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "éÓÔÏÞÎÉË É ÃÅÌØ ÓÏ×ÐÁÄÁÀÔ: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "õÖÅ × ÃÅÌÅ×ÏÍ ËÁÔÁÌÏÇÅ: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "÷ÒÅÍÅÎÎÙÊ URL ÉÌÉ ÓÐÉÓÏË ÄÏÌÖÅÎ ÂÙÔØ ÓÌÉÛËÏÍ ÄÌÉÎÎÙÍ."
 
@@ -4258,20 +4259,20 @@ msgstr "üÔÏ ÓÏÏÂÝÅÎÉÅ ÂÙÌÏ Á×ÔÏÍÁÔÉÞÅÓËÉ ÓÇÅÎÅÒÉÒÏ×ÁÎÏ"
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "ë ÓÏÖÁÌÅÎÉÀ Winsock ÎÅ ÎÁÊÄÅÎ."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 #, fuzzy
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "÷Ù äïìöîù ÏÐÒÅÄÅÌÉÔØ ÐÒÁ×ÉÌØÎÕÀ ÏÂÌÁÓÔØ TMP ÉÌÉ TEMP!\n"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "îÅÔ ËÁÔÁÌÏÇÁ"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4282,7 +4283,7 @@ msgstr ""
 "ëÏÎÆÉÇÕÒÁÃÉÏÎÎÙÊ ÆÁÊÌ %s ÎÅ ÄÏÓÔÕÐÅÎ.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4293,7 +4294,7 @@ msgstr ""
 "ëÏÄÉÒÏ×ËÉ Lynx ÎÅ ÏÐÒÅÄÅÌÅÎÙ.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4301,7 +4302,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4312,71 +4313,71 @@ msgstr ""
 "æÁÊÌ Lynx %s ÎÅ ÄÏÓÔÕÐÅÎ.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "ÓÏÓÔÏÑÎÉÅ ÐÏÓÔÏÑÎÎÙÈ cookie ÂÕÄÅÔ ÉÚÍÅÎÅÎÏ ÔÏÌØËÏ × ÓÌÅÄÕÀÝÅÍ ÓÅÁÎÓÅ."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ÎÅÒÁÓÐÏÚÎÁÎÎÁÑ ËÏÄÉÒÏ×ËÁ=%s ÉÇÎÏÒÉÒÕÅÔÓÑ\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s ÷ÅÒÓÉÑ %s (%s)\n"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "óÏÂÒÁÎÏ %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "á×ÔÏÒÓËÉÅ ÐÒÁ×Á ÐÒÉÎÁÄÌÅÖÁÔ ÕÎÉ×ÅÒÓÉÔÅÔÕ ëÁÎÚÁÓÁ, CERN, É ÄÒÕÇÉÍ ÕÞÁÓÔÎÉËÁÍ.\n"
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "òÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ × ÒÁÍËÁÈ õÎÉ×ÅÒÓÁÌØÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU.\n"
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 #, fuzzy
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 "óÍ. http://lynx.browser.org/ É ÐÏÍÏÝØ ÄÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.\n"
 "\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "éóðïìøúï÷áîéå: %s [ËÌÀÞÉ] [ÆÁÊÌ]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "ëÌÀÞÉ:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: îÅ×ÅÒÎÁÑ ÏÐÃÉÑ: %s\n"
@@ -4405,7 +4406,7 @@ msgstr "üËÒÁÎ ðÏÍÏÝÉ"
 msgid "System Index"
 msgstr "óÉÓÔÅÍÎÙÊ éÎÄÅËÓ"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "÷ÈÏÄ ÎÁ ÇÌÁ×ÎÙÊ ÜËÒÁÎ"
 
@@ -4429,65 +4430,65 @@ msgstr "ëÏÍÐÏÎÅÎÔÁ ÐÕÔÉ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ"
 msgid "failed to change directory"
 msgstr "ÎÅ ÕÄÁÌÏÓØ ÉÚÍÅÎÉÔØ ËÁÔÁÌÏÇ"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "äÏËÕÍÅÎÔ ÒÁÚÂÉÒÁÅÔÓÑ ÚÁÎÏ×Ï Ó ÕÞÅÔÏÍ ÔÅËÕÝÉÈ ÕÓÔÁÎÏ×ÏË..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "æÁÔÁÌØÎÁÑ ÏÛÉÂËÁ - ÎÅ ÕÄÁÅÔÓÑ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "ôÅËÕÝÉÊ URL ÐÕÓÔ."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "ïÝÉÂËÁ ÐÒÉ ËÏÐÉÒÏ×ÁÎÉÉ × ÂÕÆÅÒ ÏÂÍÅÎÁ."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "URL ÄÏËÕÍÅÎÔÁ ÐÏÍÅÝÅÎ × ÂÕÆÅÒ ÏÂÍÅÎÁ."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "URL ÓÓÙÌËÉ ÐÏÍÅÝÅÎ × ÂÕÆÅÒ ÏÂÍÅÎÁ."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "URL × ÂÕÆÅÒÅ ÏÂÍÅÎÁ ÏÔÓÕÔÓÔ×ÕÅÔ."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-ÉÎÄÅËÓ-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: îÅÔ ÄÏÓÔÕÐÁ Ë ÎÁÞÁÌØÎÏÍÕ ÆÁÊÌÕ"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: îÁÞÁÌØÎÙÊ ÆÁÊÌ ÌÉÂÏ ÎÅ ÕÄÁÅÔÓÑ ÎÁÊÔÉ, ÌÉÂÏ ÏÎ ÎÅ text/html ÉÌÉ text/plain"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      ÷ÙÈÏÄ..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-ÄÁÌÅÅ-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "÷Ù ÂÕÄÅÔÅ ÐÏÓÙÌÁÔØ ×:"
 
@@ -4495,7 +4496,7 @@ msgstr "÷Ù ÂÕÄÅÔÅ ÐÏÓÙÌÁÔØ ×:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4509,7 +4510,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4519,7 +4520,7 @@ msgstr ""
 "\n"
 " ðÏÖÁÌÕÊÓÔÁ, ÕËÁÖÉÔÅ ÉÌÉ ÏÔÒÅÄÁËÔÉÒÕÊÔÅ ÚÁÇÏÌÏ×ÏË Subject:\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4532,7 +4533,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4542,7 +4543,7 @@ msgstr ""
 "\n"
 " ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÎÉÖÅ ×ÁÛÅ ÓÏÏÂÝÅÎÉÅ."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "óÏÏÂÝÅÎÉÅ ÎÅ ÉÍÅÅÔ ÐÅÒ×ÏÎÁÞÁÌØÎÏÇÏ ÔÅËÓÔÁ!"
 
@@ -5212,38 +5213,38 @@ msgstr "Lynx: ÏÛÉÂËÁ ÓÔÁÒÔÁ, ÆÁÊÌ Ó ÐÒÁ×ÉÌÁÍÉ CERN %s ÎÅ ÄÏÓÔÕÐÅÎ\n"
 msgid "(no name)"
 msgstr "(ÎÅÔ ÉÍÅÎÉ)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "âÏÌØÛÅ ÞÅÍ %d ×ÌÏÖÅÎÎÙÈ ×ËÌÀÞÅÎÉÊ lynx.cfg -- ×ÏÚÍÏÖÎÏ ÃÉËÌ?!?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "ðÏÓÌÅÄÎÑÑ ÐÏÐÙÔËÁ ×ËÌÀÞÅÎÉÑ ÂÙÌÁ '%s',\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "×ËÌÀÞÅÎÏ ÉÚ '%s'.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "óÌÅÄÕÀÝÅÅ ÞÉÔÁÅÔÓÑ ÉÚ ×ÁÛÅÇÏ ÆÁÊÌÁ lynx.cfg."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÒÏÞÉÔÁÊÔÅ ÉÓÈÏÄÎÙÊ"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ËÏÍÍÅÎÔÁÒÉÅ×."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "ïâîï÷éôø éúíåîåîéñ"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "÷ÁÛÁ ÏÓÎÏ×ÎÁÑ ËÏÎÆÉÇÕÒÁÃÉÑ"
 
@@ -5279,27 +5280,27 @@ msgstr "üÌÅÍÅÎÔ, ËÏÔÏÒÙÊ ×Ù ÓÅÊÞÁÓ ×ÙÂÒÁÌÉ"
 msgid "Full name:"
 msgstr "ðÏÌÎÏÅ ÉÍÑ:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÌÅÄÏ×ÁÔØ ÐÏ ÓÓÙÌËÅ"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "õËÁÚÙ×ÁÅÔ ÎÁ ÆÁÊÌ:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "éÍÑ ×ÌÁÄÅÌØÃÁ:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "éÍÑ ÇÒÕÐÐÙ:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "òÁÚÍÅÒ ÆÁÊÌÁ:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 #, fuzzy
 msgid "(bytes)"
 msgstr "ÂÁÊÔ"
@@ -5307,163 +5308,163 @@ msgstr "ÂÁÊÔ"
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "äÁÔÁ ÓÏÚÄÁÎÉÑ:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "ðÏÓÌÅÄÎÑÑ ÍÏÄÉÆÉËÁÃÉÑ:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "ðÏÓÌÅÄÎÉÊ ÄÏÓÔÕÐ:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "ðÒÁ×Á ÄÏÓÔÕÐÁ"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 #, fuzzy
 msgid "Group:"
 msgstr "çÒÕÐÐÁ"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "æÁÊÌ, ËÏÔÏÒÙÊ ×Ù ÓÅÊÞÁÓ ÐÒÏÓÍÁÔÒÉ×ÁÅÔÅ"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "éÍÑ ÓÓÙÌËÉ:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "ëÏÄÉÒÏ×ËÁ:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "óÅÒ×ÅÒ:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "äÁÔÁ:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "ðÏÓÌ ÍÏÄ:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 #, fuzzy
 msgid "Expires:"
 msgstr "&nbsp;õÓÔÁÒÅ×ÁÅÔ:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Cache-Control:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Content-Length:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 #, fuzzy
 msgid "Length:"
 msgstr "Content-Length:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "ñÚÙË:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "äÁÎÎÙÅ Post:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "ôÉÐ ÓÏÄÅÒÖÉÍÏÇÏ Post:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "÷ÌÁÄÅÌØÃÙ:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "ÒÁÚÍÅÒ:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "ÓÔÒÏË"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "ÒÅÖÉÍ Ó ÆÏÒÍÁÍÉ"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "ÉÓÈÏÄÎÙÊ ÔÅËÓÔ"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "ÏÂÙÞÎÙÊ"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", ÂÅÚÏÐÁÓÎÙÊ"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", ÞÅÒÅÚ ×ÎÕÔÒÅÎÎÀÀ ÓÓÙÌËÕ"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", ÎÅ ËÜÛÉÒÏ×ÁÔØ"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", ISMAP-ÓËÒÉÐÔ"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", ÆÁÊÌ ÚÁËÌÁÄÏË"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "ÒÅÖÉÍ:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "óÓÙÌËÁ, ËÏÔÏÒÕÀ ×Ù ÓÅÊÞÁÓ ×ÙÂÒÁÌÉ"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "íÅÔÏÄ:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "ôÉÐ ÛÉÆÒÏ×ÁÎÉÑ:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 #, fuzzy
 msgid "Action:"
 msgstr "áÄÒÅÓ: "
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(ðÏÌÅ ÆÏÒÍÙ)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "îÁ ÜÔÏÊ ÓÔÒÁÎÉÃÅ ÎÅÔ ÓÓÙÌÏË"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 #, fuzzy
 msgid "Server Headers:"
 msgstr "óÅÒ×ÅÒ:"
@@ -5517,33 +5518,33 @@ msgstr "úÁÇÒÕÚÉÔØ ×:"
 msgid "Upload options:"
 msgstr "ïÐÃÉÉ ÚÁÇÒÕÚËÉ:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "îÅÏÖÉÄÁÎÎÙÊ ÐÒÏÔÏËÏÌ ÄÏÓÔÕÐÁ ÄÌÑ ÜÔÏÊ ÓÈÅÍÙ URL."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ×ÒÅÍÅÎÎÙÈ ÆÁÊÌÏ×"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "ÎÅÉÚ×ÅÓÔÎÏÅ ÏÇÒÁÎÉÞÅÎÉÅ"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "ïÇÒÁÎÉÞÅÎÉÊ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "õÓÔÁÎÏ×ÌÅÎÎÙÅ ÏÇÒÁÎÉÞÅÎÉÑ:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "äÏÍÁÛÎÉÊ ËÁÔÁÌÏÇ ÎÅ ÎÁÊÄÅÎ"
 
@@ -6133,6 +6134,9 @@ msgstr ""
 #~ msgid "History List maximum reached!  Document not pushed."
 #~ msgstr "äÏÓÔÉÇÎÕÔ ÍÁËÓÉÍÕÍ óÐÉÓËÁ éÓÔÏÒÉÉ!  äÏËÕÍÅÎÔ ÎÅ ÐÏÍÅÝÅÎ."
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÓÏËÅÔÁ × ÔÅÞÅÎÉÅ 180,000 ÐÏÐÙÔÏË."
+
 #~ msgid "KB"
 #~ msgstr "ëâ"
 
diff --git a/po/rw.po b/po/rw.po
deleted file mode 100644
index 61a7fa61..00000000
--- a/po/rw.po
+++ /dev/null
@@ -1,6828 +0,0 @@
-# Kinyarwanda translations for lynx package.
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the lynx package.
-# Steve Murphy <murf@e-tools.com>, 2005.
-# Steve performed initial rough translation from compendium built from translations provided by the following translators:
-# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
-# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
-# Noëlla Mupole <s24211045@tuks.co.za>, 2005.
-# Carole Karema <karemacarole@hotmail.com>, 2005.
-# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
-# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
-# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005.
-# Antoine Bigirimana <antoine@e-tools.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: lynx 2.8.5pre9\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. ******************************************************************
-#. * The following definitions are for status line prompts, messages, or
-#. * warnings issued by Lynx during program execution.  You can modify
-#. * them to make them more appropriate for your site.  We recommend that
-#. * you extend these definitions to other languages using the gettext
-#. * library.  There are also scattered uses of 'gettext()' throughout the
-#. * Lynx source, covering all but those messages which (a) are used for
-#. * debugging (CTRACE) or (b) are constants used in interaction with
-#. * other programs.
-#. *
-#. * Links to collections of alternate definitions, developed by the Lynx
-#. * User Community, are maintained in Lynx links:
-#. *
-#. *    http://www.subir.com/lynx.html
-#. *
-#. * See ABOUT-NLS and po/readme for details and location of contributed
-#. * translations.  When no translation is available, the English default is
-#. * used.
-#.
-#: LYMessages.c:32
-#, fuzzy, c-format
-msgid "Alert!: %s"
-msgstr "Ikimenyetso"
-
-#: LYMessages.c:33
-msgid "Welcome"
-msgstr "Urakaza neza"
-
-#: LYMessages.c:34
-#, fuzzy
-msgid "Are you sure you want to quit?"
-msgstr "Kuri Kuvamo"
-
-#: LYMessages.c:36
-#, fuzzy
-msgid "Really exit from Lynx?"
-msgstr "Gusohoka Bivuye"
-
-#: LYMessages.c:38
-msgid "Connection interrupted."
-msgstr ""
-
-#: LYMessages.c:39
-msgid "Data transfer interrupted."
-msgstr ""
-
-#: LYMessages.c:40
-#, fuzzy
-msgid "Cancelled!!!"
-msgstr "Kureka"
-
-# # @name NS_MSG_CANCELLING
-#: LYMessages.c:41
-#, fuzzy
-msgid "Cancelling!"
-msgstr "Kureka..."
-
-#: LYMessages.c:42
-msgid "Excellent!!!"
-msgstr ""
-
-#: LYMessages.c:43
-msgid "OK"
-msgstr "OKE"
-
-#: LYMessages.c:44
-#, fuzzy
-msgid "Done!"
-msgstr "Byakozwe."
-
-#: LYMessages.c:45
-#, fuzzy
-msgid "Bad request!"
-msgstr "Kubaza..."
-
-#: LYMessages.c:46
-#, fuzzy
-msgid "previous"
-msgstr "Ibanjirije"
-
-#: LYMessages.c:47
-#, fuzzy
-msgid "next screen"
-msgstr "Komeza>> Mugaragaza"
-
-#: LYMessages.c:48
-#, fuzzy
-msgid "HELP!"
-msgstr "Ifashayobora"
-
-#: LYMessages.c:49
-#, fuzzy
-msgid ", help on "
-msgstr ",Ifashayobora ku"
-
-#. #define HELP
-#: LYMessages.c:51
-#, fuzzy
-msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
-msgstr "Akambi Utubuto Kuri Kwimura kugirango Ifashayobora Kuri Kuvamo Kuri Gyayo Inyuma"
-
-#. #define MOREHELP
-#: LYMessages.c:53
-#, fuzzy
-msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
-msgstr "--Kanda Umwanya kugirango Birenzeho Gukoresha Akambi Utubuto Kuri Kwimura kugirango Ifashayobora Kuri Kuvamo"
-
-#: LYMessages.c:54
-#, fuzzy
-msgid "-- press space for next page --"
-msgstr "--Kanda Umwanya kugirango Komeza>> Ipaji"
-
-#: LYMessages.c:55
-msgid "URL too long"
-msgstr ""
-
-#. Inactive input fields, messages used with -tna option - kw
-#. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:61
-#, fuzzy
-msgid "(Text entry field) Inactive.  Press <return> to activate."
-msgstr "(Icyinjijwe Umwanya Garuka Kuri Kureka bigakora"
-
-#. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:63
-#, fuzzy
-msgid "(Textarea) Inactive.  Press <return> to activate."
-msgstr "(Garuka Kuri Kureka bigakora"
-
-#. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:65
-#, fuzzy, c-format
-msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
-msgstr "(Garuka Kuri Kureka bigakora kugirango Muhinduzi"
-
-#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:67
-#, fuzzy
-msgid "(Form field) Inactive.  Use <return> to edit."
-msgstr "(Umwanya Garuka Kuri Guhindura"
-
-#. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:69
-#, fuzzy, c-format
-msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
-msgstr "(Umwanya Garuka Kuri Guhindura Kuri Tanga Na: Oya Ubwihisho"
-
-#. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:71
-#, fuzzy
-msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
-msgstr "(Umwanya Garuka Kuri Guhindura Kanda Garuka Kuri Tanga"
-
-#. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:73
-#, fuzzy
-msgid "(mailto form field) Inactive.  Press <return> to change."
-msgstr "(UBUTUMWA BUJYA KWA Ifishi Umwanya Garuka Kuri Guhindura>>"
-
-#. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:75
-#, fuzzy
-msgid "(Password entry field) Inactive.  Press <return> to activate."
-msgstr "(Icyinjijwe Umwanya Garuka Kuri Kureka bigakora"
-
-#. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:78
-#, fuzzy
-msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
-msgstr "IDOSIYE Icyinjijwe Umwanya Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:80
-#, fuzzy
-msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Idosiye Icyinjijwe Umwanya Izina ry'idosiye: Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:82
-#, fuzzy
-msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Icyinjijwe Umwanya Umwandiko Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:84
-#, fuzzy
-msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
-msgstr "(Umwandiko Utwambi Cyangwa Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:86
-#, fuzzy, c-format
-msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
-msgstr "(Umwandiko Utwambi Cyangwa Kuri Kwimura Bidakora kugirango Muhinduzi"
-
-#. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:88
-#, fuzzy
-msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
-msgstr "Ifishi Umwandiko Umwanya Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:90
-#, fuzzy
-msgid "(Form field) Enter text.  Use <return> to submit."
-msgstr "(Umwanya Umwandiko Garuka Kuri Tanga"
-
-#. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:92
-#, fuzzy, c-format
-msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
-msgstr "(Umwanya Umwandiko Garuka Kuri Tanga kugirango Oya Ubwihisho"
-
-#. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:94
-#, fuzzy
-msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
-msgstr "(Umwanya Umwandiko Garuka Kuri Tanga Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:96
-#, fuzzy
-msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
-msgstr "Ifishi Umwanya Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:98
-#, fuzzy
-msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
-msgstr "(UBUTUMWA BUJYA KWA Ifishi Umwanya Umwandiko Garuka Kuri Tanga Utwambi Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:100
-#, fuzzy
-msgid "(mailto form field) Mail is disallowed so you cannot submit."
-msgstr "(UBUTUMWA BUJYA KWA Ifishi Umwanya ni Tanga"
-
-#. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:102
-#, fuzzy
-msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Icyinjijwe Umwanya Umwandiko Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:104
-#, fuzzy
-msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
-msgstr "Ifishi Ijambobanga... Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:106
-#, fuzzy
-msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
-msgstr "(Iburyo: Akambi Cyangwa Garuka Kuri Mukomatanya"
-
-#. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:108
-#, fuzzy
-msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
-msgstr "Ifishi Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:110
-#, fuzzy
-msgid "(Radio Button)   Use right-arrow or <return> to toggle."
-msgstr "(Iburyo: Akambi Cyangwa Garuka Kuri Mukomatanya"
-
-#. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:112
-#, fuzzy
-msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
-msgstr "Ifishi Akabuto Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:114
-#, fuzzy
-msgid "Submit ('x' for no cache) to "
-msgstr "kugirango Oya Ubwihisho Kuri"
-
-#. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:116
-#, fuzzy
-msgid "Submit to "
-msgstr "Kuri"
-
-#. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:118
-#, fuzzy
-msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
-msgstr "(Tanga Akabuto Iburyo: Akambi Cyangwa Garuka Kuri Tanga kugirango Oya Ubwihisho"
-
-#. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:120
-#, fuzzy
-msgid "(Form submit button) Use right-arrow or <return> to submit."
-msgstr "(Tanga Akabuto Iburyo: Akambi Cyangwa Garuka Kuri Tanga"
-
-#. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:122
-#, fuzzy
-msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
-msgstr "Ifishi Tanga Akabuto Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:124
-#, fuzzy
-msgid "Submit mailto form to "
-msgstr "UBUTUMWA BUJYA KWA Ifishi Kuri"
-
-#. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:126
-#, fuzzy
-msgid "(mailto form submit button) Use right-arrow or <return> to submit."
-msgstr "(UBUTUMWA BUJYA KWA Ifishi Tanga Akabuto Iburyo: Akambi Cyangwa Garuka Kuri Tanga"
-
-#. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:128
-#, fuzzy
-msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
-msgstr "(UBUTUMWA BUJYA KWA Ifishi Tanga Akabuto ni Tanga"
-
-#. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:130
-#, fuzzy
-msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
-msgstr "(Kugarura Akabuto Iburyo: Akambi Cyangwa Garuka Kuri Kugarura Ifishi Kuri"
-
-#. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:132
-#, fuzzy
-msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
-msgstr "Ifishi Kugarura Akabuto Cyangwa Utwambi Cyangwa Isunika Kuri Kwimura Bidakora"
-
-#. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:134
-#, fuzzy
-msgid "(Option list) Hit return and use arrow keys and return to select option."
-msgstr "(Urutonde Garuka Na Gukoresha Akambi Utubuto Na Garuka Kuri Guhitamo Ihitamo"
-
-#. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:136
-#, fuzzy
-msgid "(Choice list) Hit return and use arrow keys and return to select option."
-msgstr "(Urutonde Garuka Na Gukoresha Akambi Utubuto Na Garuka Kuri Guhitamo Ihitamo"
-
-#. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:138
-#, fuzzy
-msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
-msgstr "Ihitamo Urutonde Garuka Cyangwa Akambi Utubuto Kuri Isubiramo Cyangwa"
-
-#. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:140
-#, fuzzy
-msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
-msgstr "Urutonde Garuka Cyangwa Akambi Utubuto Kuri Isubiramo Cyangwa"
-
-#: LYMessages.c:141
-#, fuzzy
-msgid "Submitting form..."
-msgstr "Ifishi"
-
-#: LYMessages.c:142
-#, fuzzy
-msgid "Resetting form..."
-msgstr "Ifishi"
-
-#. #define RELOADING_FORM
-#: LYMessages.c:144
-#, fuzzy
-msgid "Reloading document.  Any form entries will be lost!"
-msgstr "Inyandiko Ifishi Ibyinjijwe"
-
-#: LYMessages.c:145
-#, fuzzy, c-format
-msgid "Warning: Cannot transcode form data to charset %s!"
-msgstr "Ifishi Ibyatanzwe Kuri"
-
-#. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:148
-#, fuzzy
-msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
-msgstr "(Iburyo: Akambi Cyangwa Garuka Kuri Kureka bigakora"
-
-#: LYMessages.c:149
-#, fuzzy
-msgid "The resource requested is not available at this time."
-msgstr "ni OYA Bihari ku iyi Igihe"
-
-#: LYMessages.c:150
-#, fuzzy
-msgid "Enter Lynx keystroke command: "
-msgstr "Komandi:"
-
-#: LYMessages.c:151
-#, fuzzy
-msgid "Looking up "
-msgstr "Hejuru"
-
-#: LYMessages.c:152
-#, c-format
-msgid "Getting %s"
-msgstr ""
-
-#: LYMessages.c:153
-#, fuzzy, c-format
-msgid "Skipping %s"
-msgstr "Gusimbuka: %s"
-
-#: LYMessages.c:154
-#, fuzzy, c-format
-msgid "Using %s"
-msgstr "ikoresha"
-
-#: LYMessages.c:155
-#, c-format
-msgid "Illegal URL: %s"
-msgstr ""
-
-#: LYMessages.c:156
-#, fuzzy, c-format
-msgid "Badly formed address %s"
-msgstr "Aderesi"
-
-# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-# #-#-#-#-#  dbaccess.pot (PACKAGE VERSION)  #-#-#-#-#
-#: LYMessages.c:157
-#, fuzzy, c-format
-msgid "URL: %s"
-msgstr "URL: %s"
-
-#: LYMessages.c:158
-#, fuzzy
-msgid "Unable to access WWW file!!!"
-msgstr "Kuri IDOSIYE"
-
-#: LYMessages.c:159
-#, fuzzy, c-format
-msgid "This is a searchable index.  Use %s to search."
-msgstr "Uyumubarendangaushoboragushakishwa."
-
-#. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:161
-#, fuzzy, c-format
-msgid "--More--  This is a searchable index.  Use %s to search."
-msgstr "--ni a Umubarendanga Kuri Gushaka"
-
-#: LYMessages.c:162
-#, fuzzy
-msgid "You have entered an invalid link number."
-msgstr "Sibyo Ihuza Umubare"
-
-#. #define SOURCE_HELP
-#: LYMessages.c:164
-#, fuzzy
-msgid "Currently viewing document source.  Press '\\' to return to rendered version."
-msgstr "Inyandiko Inkomoko Kuri Garuka Kuri Verisiyo"
-
-#. #define NOVICE_LINE_ONE
-#: LYMessages.c:166
-#, fuzzy
-msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
-msgstr "Utubuto Na Kuri Kwimura Kuri a Ihuza Kuri Gyayo Inyuma\n"
-
-#. #define NOVICE_LINE_TWO
-#: LYMessages.c:168
-#, fuzzy
-msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
-msgstr "H o Mugaragaza Gushaka Gusiba Urutonde Urutonde\n"
-
-#. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:170
-#, fuzzy
-msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
-msgstr "H Mugaragaza o\n"
-
-#. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:172
-#, fuzzy
-msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
-msgstr "E Mugaragaza Gushaka\n"
-
-#. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:174
-#, fuzzy
-msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
-msgstr "C Gusiba usubira inyuma V A\n"
-
-#. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:176
-#, fuzzy
-msgid "            Enter text into the field by typing on the keyboard              "
-msgstr "Umwandiko i Umwanya ku Kwandika: ku i Mwandikisho"
-
-#. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:178
-#, fuzzy
-msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
-msgstr "U Kuri Gusiba Byose Umwandiko in Umwanya Kuri Gusiba a Inyuguti"
-
-#. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:180
-#, fuzzy
-msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
-msgstr "U Kuri Gusiba Umwandiko in Umwanya Kuri Gusiba a Inyuguti"
-
-#. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:182
-#, fuzzy, c-format
-msgid "    %s to delete all text in field, [Backspace] to delete a character    "
-msgstr "%sKuri Gusiba Byose Umwandiko in Umwanya Kuri Gusiba a Inyuguti"
-
-#. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:184
-#, fuzzy, c-format
-msgid "      %s to delete text in field, [Backspace] to delete a character    "
-msgstr "%sKuri Gusiba Umwandiko in Umwanya Kuri Gusiba a Inyuguti"
-
-#. mailto
-#: LYMessages.c:187
-#, fuzzy
-msgid "Malformed mailto form submission!  Cancelled!"
-msgstr "UBUTUMWA BUJYA KWA Ifishi Icyoherejwe"
-
-#: LYMessages.c:188
-#, fuzzy
-msgid "Warning!  Control codes in mail address replaced by ?"
-msgstr "in Ubutumwa Aderesi ku"
-
-#: LYMessages.c:189
-#, fuzzy
-msgid "Mail disallowed!  Cannot submit."
-msgstr "Tanga"
-
-#: LYMessages.c:190
-#, fuzzy
-msgid "Mailto form submission failed!"
-msgstr "Ifishi Icyoherejwe Byanze"
-
-#: LYMessages.c:191
-#, fuzzy
-msgid "Mailto form submission Cancelled!!!"
-msgstr "Ifishi Icyoherejwe"
-
-#: LYMessages.c:192
-#, fuzzy
-msgid "Sending form content..."
-msgstr "Ifishi Ibikubiyemo"
-
-#: LYMessages.c:193
-#, fuzzy
-msgid "No email address is present in mailto URL!"
-msgstr "imeli Aderesi ni in UBUTUMWA BUJYA KWA"
-
-#. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:195
-#, fuzzy
-msgid "Unable to open temporary file for mailto URL!"
-msgstr "Kuri Gufungura By'igihe gito IDOSIYE kugirango UBUTUMWA BUJYA KWA"
-
-#. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:197
-#, fuzzy
-msgid "Do you wish to include the original message?"
-msgstr "Kuri Gushyiramo i Umwimerere Ubutumwa"
-
-#. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:199
-#, fuzzy
-msgid "Do you wish to include the preparsed source?"
-msgstr "Kuri Gushyiramo i Inkomoko"
-
-#. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:201
-#, fuzzy
-msgid "Spawning your selected editor to edit mail message"
-msgstr "Byahiswemo Muhinduzi Kuri Guhindura Ubutumwa Ubutumwa"
-
-#. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:203
-#, fuzzy
-msgid "Error spawning editor, check your editor definition in the options menu"
-msgstr "Muhinduzi Kugenzura... Muhinduzi Insobanuro in i Amahitamo Ibikubiyemo"
-
-#: LYMessages.c:204
-#, fuzzy
-msgid "Send this comment?"
-msgstr "iyi Icyo wongeraho"
-
-#: LYMessages.c:205
-#, fuzzy
-msgid "Send this message?"
-msgstr "iyi Ubutumwa"
-
-#: LYMessages.c:206
-#, fuzzy
-msgid "Sending your message..."
-msgstr "Ubutumwa"
-
-#: LYMessages.c:207
-#, fuzzy
-msgid "Sending your comment:"
-msgstr "Icyo wongeraho"
-
-#. textarea
-#: LYMessages.c:210
-#, fuzzy
-msgid "Not in a TEXTAREA; cannot use external editor."
-msgstr "in a Gukoresha external Muhinduzi"
-
-#: LYMessages.c:211
-#, fuzzy
-msgid "Not in a TEXTAREA; cannot use command."
-msgstr "in a Gukoresha Komandi:"
-
-#: LYMessages.c:213
-#, fuzzy
-msgid "file: ACTIONs are disallowed!"
-msgstr "IDOSIYE"
-
-#. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:215
-#, fuzzy
-msgid "file: URLs via served links are disallowed!"
-msgstr "IDOSIYE Biturutse amahuza"
-
-#: LYMessages.c:216
-#, fuzzy
-msgid "Access to local files denied."
-msgstr "Kuri Idosiye"
-
-#: LYMessages.c:217
-#, fuzzy
-msgid "file: URLs via bookmarks are disallowed!"
-msgstr "IDOSIYE Biturutse Ibirango"
-
-#. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:219
-#, fuzzy
-msgid "This special URL is not allowed in external documents!"
-msgstr "Bidasanzwe ni OYA in external Inyandiko"
-
-#: LYMessages.c:220
-#, fuzzy
-msgid "Press <return> to return to Lynx."
-msgstr "Garuka Kuri Garuka Kuri"
-
-#. #define SPAWNING_MSG
-#: LYMessages.c:223
-#, fuzzy
-msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
-msgstr "Kuri Garuka Kuri\n"
-
-#. #define SPAWNING_MSG
-#: LYMessages.c:227
-#, fuzzy
-msgid "Type EXIT to return to Lynx.\n"
-msgstr "Kuri Garuka Kuri\n"
-
-#. #define SPAWNING_MSG
-#: LYMessages.c:230
-#, fuzzy
-msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
-msgstr "Mburabuzi Igikonoshwa Kuri Garuka Kuri\n"
-
-#: LYMessages.c:233
-#, fuzzy
-msgid "Spawning is currently disabled."
-msgstr "ni Yahagaritswe"
-
-#: LYMessages.c:234
-#, fuzzy
-msgid "The 'd'ownload command is currently disabled."
-msgstr "Komandi: ni Yahagaritswe"
-
-#: LYMessages.c:235
-#, fuzzy
-msgid "You cannot download an input field."
-msgstr "Gufungura Iyinjiza Umwanya"
-
-#: LYMessages.c:236
-#, fuzzy
-msgid "Form has a mailto action!  Cannot download."
-msgstr "a UBUTUMWA BUJYA KWA Igikorwa Gufungura"
-
-#: LYMessages.c:237
-#, fuzzy
-msgid "You cannot download a mailto: link."
-msgstr "Gufungura a UBUTUMWA BUJYA KWA Ihuza"
-
-#: LYMessages.c:238
-#, fuzzy
-msgid "You cannot download cookies."
-msgstr "Gufungura Inyandikonyakwirema"
-
-#: LYMessages.c:239
-#, fuzzy
-msgid "You cannot download a printing option."
-msgstr "Gufungura a Icapa... Ihitamo"
-
-#: LYMessages.c:240
-#, fuzzy
-msgid "You cannot download an upload option."
-msgstr "Gufungura Ihitamo"
-
-#: LYMessages.c:241
-#, fuzzy
-msgid "You cannot download an permit option."
-msgstr "Gufungura Ihitamo"
-
-#: LYMessages.c:242
-#, fuzzy
-msgid "This special URL cannot be downloaded!"
-msgstr "Bidasanzwe Yimuwe"
-
-#: LYMessages.c:243
-#, fuzzy
-msgid "Nothing to download."
-msgstr "Kuri Gufungura"
-
-#: LYMessages.c:244
-msgid "Trace ON!"
-msgstr ""
-
-#: LYMessages.c:245
-msgid "Trace OFF!"
-msgstr ""
-
-#. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:247
-#, fuzzy
-msgid "Links will be included for all images!  Reloading..."
-msgstr "kugirango Byose Ishusho"
-
-#. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:249
-#, fuzzy
-msgid "Standard image handling restored!  Reloading..."
-msgstr "Ishusho"
-
-#. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:251
-#, fuzzy
-msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
-msgstr "Byinjijwemo kugirango Ikurikiranyanyuguti"
-
-#. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:253
-#, fuzzy
-msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
-msgstr "Ikurikiranyanyuguti"
-
-#: LYMessages.c:254
-#, fuzzy
-msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
-msgstr "8 Cyangwa Ubwoko"
-
-#: LYMessages.c:255
-#, fuzzy
-msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
-msgstr "8 Cyangwa Ubwoko"
-
-#. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:257
-#, fuzzy
-msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
-msgstr "Kubaza... kugirango Cyangwa Cyangwa C D L C"
-
-#. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:259
-#, fuzzy
-msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
-msgstr "Kubaza... kugirango Cyangwa C D C"
-
-#: LYMessages.c:260
-#, fuzzy
-msgid "Sorry, the document is not an http URL."
-msgstr "i Inyandiko ni OYA HTTP"
-
-#: LYMessages.c:261
-#, fuzzy
-msgid "Sorry, the link is not an http URL."
-msgstr "i Ihuza ni OYA HTTP"
-
-#: LYMessages.c:262
-#, fuzzy
-msgid "Sorry, the ACTION for this form is disabled."
-msgstr "i kugirango iyi Ifishi ni Yahagaritswe"
-
-#. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:264
-#, fuzzy
-msgid "Sorry, the ACTION for this form is not an http URL."
-msgstr "i kugirango iyi Ifishi ni OYA HTTP"
-
-#: LYMessages.c:265
-#, fuzzy
-msgid "Not an http URL or form ACTION!"
-msgstr "HTTP Cyangwa Ifishi"
-
-#: LYMessages.c:266
-#, fuzzy
-msgid "This special URL cannot be a form ACTION!"
-msgstr "Bidasanzwe a Ifishi"
-
-#: LYMessages.c:267
-#, fuzzy
-msgid "URL is not in starting realm!"
-msgstr "ni OYA in"
-
-#: LYMessages.c:268
-#, fuzzy
-msgid "News posting is disabled!"
-msgstr "ni Yahagaritswe"
-
-#: LYMessages.c:269
-#, fuzzy
-msgid "File management support is disabled!"
-msgstr "Idosiye Gushigikira ni Yahagaritswe"
-
-#: LYMessages.c:270
-#, fuzzy
-msgid "No jump file is currently available."
-msgstr "Simbuka IDOSIYE ni Bihari"
-
-#: LYMessages.c:271
-#, fuzzy
-msgid "Jump to (use '?' for list): "
-msgstr "Kuri Gukoresha kugirango Urutonde"
-
-#: LYMessages.c:272
-#, fuzzy
-msgid "Jumping to a shortcut URL is disallowed!"
-msgstr "Kuri a Iy'ibusamo ni"
-
-#: LYMessages.c:273
-#, fuzzy
-msgid "Random URL is disallowed!  Use a shortcut."
-msgstr "ni a Iy'ibusamo"
-
-#: LYMessages.c:274
-msgid "No random URLs have been used thus far."
-msgstr ""
-
-#: LYMessages.c:275
-#, fuzzy
-msgid "Bookmark features are currently disabled."
-msgstr "Ibiranga Yahagaritswe"
-
-#: LYMessages.c:276
-#, fuzzy
-msgid "Execution via bookmarks is disabled."
-msgstr "Biturutse Ibirango ni Yahagaritswe"
-
-#. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:278
-#, fuzzy, c-format
-msgid "Bookmark file is not defined. Use %s to see options."
-msgstr "IDOSIYE ni OYA Kuri Amahitamo"
-
-#. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:280
-#, fuzzy
-msgid "Unable to open tempfile for X Mosaic hotlist conversion."
-msgstr "Kuri Gufungura kugirango Ihindurangero"
-
-#: LYMessages.c:281
-#, fuzzy
-msgid "ERROR - unable to open bookmark file."
-msgstr "Kuri Gufungura Akamenyetso IDOSIYE"
-
-#. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:283
-#, fuzzy
-msgid "Unable to open bookmark file for deletion of link."
-msgstr "Kuri Gufungura Akamenyetso IDOSIYE kugirango Isibwa Bya Ihuza"
-
-#. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
-#, fuzzy
-msgid "Unable to open scratch file for deletion of link."
-msgstr "Kuri Gufungura IDOSIYE kugirango Isibwa Bya Ihuza"
-
-#: LYMessages.c:287
-#, fuzzy
-msgid "Error renaming scratch file."
-msgstr "IDOSIYE"
-
-#: LYMessages.c:289
-#, fuzzy
-msgid "Error renaming temporary file."
-msgstr "By'igihe gito IDOSIYE"
-
-#. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:291
-#, fuzzy
-msgid "Unable to copy temporary file for deletion of link."
-msgstr "Kuri Gukoporora By'igihe gito IDOSIYE kugirango Isibwa Bya Ihuza"
-
-#. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:293
-#, fuzzy
-msgid "Unable to reopen temporary file for deletion of link."
-msgstr "Kuri By'igihe gito IDOSIYE kugirango Isibwa Bya Ihuza"
-
-#. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:296
-#, fuzzy
-msgid "Link is not by itself all on one line in bookmark file."
-msgstr "ni OYA ku Byose ku Umurongo in Akamenyetso IDOSIYE"
-
-#: LYMessages.c:297
-#, fuzzy
-msgid "Bookmark deletion failed."
-msgstr "Isibwa Byanze"
-
-#. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:299
-#, fuzzy
-msgid "Bookmark files cannot be traversed (only http URLs)."
-msgstr "Idosiye HTTP"
-
-#. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:301
-#, fuzzy
-msgid "Unable to open bookmark file, use 'a' to save a link first"
-msgstr "Kuri Gufungura Akamenyetso IDOSIYE Gukoresha Kuri Kubika a Ihuza Itangira"
-
-#: LYMessages.c:302
-#, fuzzy
-msgid "There are no links in this bookmark file!"
-msgstr "Oya amahuza in iyi Akamenyetso IDOSIYE"
-
-#. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:304
-#, fuzzy
-msgid "D)elete cached document or C)ancel? (d,c): "
-msgstr "Kubaza... kugirango Cyangwa C D C"
-
-#. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:306
-#, fuzzy
-msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
-msgstr "Kubika Cyangwa Kuri Akamenyetso IDOSIYE Cyangwa C D L C"
-
-#: LYMessages.c:307
-#, fuzzy
-msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
-msgstr "Kubika Kuri Akamenyetso IDOSIYE Cyangwa C D C"
-
-#: LYMessages.c:308
-#, fuzzy
-msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
-msgstr "Kubika Kuri Akamenyetso IDOSIYE Cyangwa C L C"
-
-#. #define NOBOOK_POST_FORM
-#: LYMessages.c:310
-#, fuzzy
-msgid "Documents from forms with POST content cannot be saved as bookmarks."
-msgstr "Bivuye Amafishi Na: Ibikubiyemo Nka Ibirango"
-
-#: LYMessages.c:311
-#, fuzzy
-msgid "Cannot save form fields/links"
-msgstr "Kubika Ifishi Imyanya amahuza"
-
-#. #define NOBOOK_HSML
-#: LYMessages.c:313
-#, fuzzy
-msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
-msgstr "Ibikubiyemo Na Urutonde Idosiye Nka Ibirango"
-
-#. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:315
-#, fuzzy
-msgid "Do you really want to delete this link from your bookmark file?"
-msgstr "Kuri Gusiba iyi Ihuza Bivuye Akamenyetso IDOSIYE"
-
-#: LYMessages.c:316
-#, fuzzy
-msgid "Malformed address."
-msgstr "Aderesi"
-
-#. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:318
-#, fuzzy
-msgid "Historical comment parsing ON (Minimal is overridden)!"
-msgstr "Icyo wongeraho ni"
-
-#. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:320
-#, fuzzy
-msgid "Historical comment parsing OFF (Minimal is in effect)!"
-msgstr "Icyo wongeraho ni in INGARUKA"
-
-#. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:322
-#, fuzzy
-msgid "Historical comment parsing ON (Valid is overridden)!"
-msgstr "Icyo wongeraho ni"
-
-#. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:324
-#, fuzzy
-msgid "Historical comment parsing OFF (Valid is in effect)!"
-msgstr "Icyo wongeraho ni in INGARUKA"
-
-#. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:326
-#, fuzzy
-msgid "Minimal comment parsing ON (and in effect)!"
-msgstr "Icyo wongeraho Na in INGARUKA"
-
-#. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:328
-#, fuzzy
-msgid "Minimal comment parsing OFF (Valid is in effect)!"
-msgstr "Icyo wongeraho ni in INGARUKA"
-
-#. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:330
-#, fuzzy
-msgid "Minimal comment parsing ON (but Historical is in effect)!"
-msgstr "Icyo wongeraho ni in INGARUKA"
-
-#. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:332
-#, fuzzy
-msgid "Minimal comment parsing OFF (Historical is in effect)!"
-msgstr "Icyo wongeraho ni in INGARUKA"
-
-#: LYMessages.c:333
-#, fuzzy
-msgid "Soft double-quote parsing ON!"
-msgstr "MAHARAKUBIRI Gushyiraho akugarizo"
-
-#: LYMessages.c:334
-#, fuzzy
-msgid "Soft double-quote parsing OFF!"
-msgstr "MAHARAKUBIRI Gushyiraho akugarizo"
-
-#: LYMessages.c:335
-#, fuzzy
-msgid "Now using TagSoup parsing of HTML."
-msgstr "ikoresha Bya"
-
-#: LYMessages.c:336
-#, fuzzy
-msgid "Now using SortaSGML parsing of HTML!"
-msgstr "ikoresha Bya"
-
-#: LYMessages.c:337
-#, fuzzy
-msgid "You are already at the end of this document."
-msgstr "ku i Impera Bya iyi Inyandiko"
-
-#: LYMessages.c:338
-#, fuzzy
-msgid "You are already at the beginning of this document."
-msgstr "ku i Itangiriro Bya iyi Inyandiko"
-
-#: LYMessages.c:339
-#, fuzzy, c-format
-msgid "You are already at page %d of this document."
-msgstr "ku Ipaji Bya iyi Inyandiko"
-
-#: LYMessages.c:340
-#, fuzzy, c-format
-msgid "Link number %d already is current."
-msgstr "Umubare ni KIGEZWEHO"
-
-#: LYMessages.c:341
-#, fuzzy
-msgid "You are already at the first document"
-msgstr "ku i Itangira Inyandiko"
-
-#: LYMessages.c:342
-#, fuzzy
-msgid "There are no links above this line of the document."
-msgstr "Oya amahuza hejuru iyi Umurongo Bya i Inyandiko"
-
-#: LYMessages.c:343
-#, fuzzy
-msgid "There are no links below this line of the document."
-msgstr "Oya amahuza munsi iyi Umurongo Bya i Inyandiko"
-
-#. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:345
-#, fuzzy
-msgid "Maximum length reached!  Delete text or move off field."
-msgstr "Uburebure Umwandiko Cyangwa Kwimura Bidakora Umwanya"
-
-#. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:347
-#, fuzzy
-msgid "You are not on a form submission button or normal link."
-msgstr "OYA ku a Ifishi Icyoherejwe Akabuto Cyangwa Bisanzwe Ihuza"
-
-#. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:349
-#, fuzzy
-msgid "One radio button must be checked at all times!"
-msgstr "Akabuto Ivivuwe ku Byose Times"
-
-#: LYMessages.c:350
-#, fuzzy
-msgid "No submit button for this form, submit single text field?"
-msgstr "Tanga Akabuto kugirango iyi Ifishi Tanga UMWE Umwandiko Umwanya"
-
-#: LYMessages.c:351
-#, fuzzy
-msgid "Do you want to go back to the previous document?"
-msgstr "Kuri Gyayo Inyuma Kuri i Ibanjirije Inyandiko"
-
-#: LYMessages.c:352
-#, fuzzy
-msgid "Use arrows or tab to move off of field."
-msgstr "Utwambi Cyangwa Isunika Kuri Kwimura Bidakora Bya Umwanya"
-
-#. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:354
-#, fuzzy
-msgid "Enter text.  Use arrows or tab to move off of field."
-msgstr "Umwandiko Utwambi Cyangwa Isunika Kuri Kwimura Bidakora Bya Umwanya"
-
-#: LYMessages.c:355
-#, fuzzy
-msgid "** Bad HTML!!  No form action defined. **"
-msgstr "**Ifishi Igikorwa"
-
-#: LYMessages.c:356
-#, fuzzy
-msgid "Bad HTML!!  Unable to create popup window!"
-msgstr "Kuri Kurema Idirishya"
-
-#: LYMessages.c:357
-#, fuzzy
-msgid "Unable to create popup window!"
-msgstr "Kuri Kurema Idirishya"
-
-#: LYMessages.c:358
-#, fuzzy
-msgid "Goto a random URL is disallowed!"
-msgstr "a ni"
-
-#: LYMessages.c:359
-#, fuzzy
-msgid "Goto a non-http URL is disallowed!"
-msgstr "a HTTP ni"
-
-#: LYMessages.c:360
-#, fuzzy, c-format
-msgid "You are not allowed to goto \"%s\" URLs"
-msgstr "OYA Kuri"
-
-#: LYMessages.c:361
-#, fuzzy
-msgid "URL to open: "
-msgstr "Kuri Gufungura"
-
-#: LYMessages.c:362
-#, fuzzy
-msgid "Edit the current Goto URL: "
-msgstr "i KIGEZWEHO"
-
-#: LYMessages.c:363
-#, fuzzy
-msgid "Edit the previous Goto URL: "
-msgstr "i Ibanjirije"
-
-#: LYMessages.c:364
-#, fuzzy
-msgid "Edit a previous Goto URL: "
-msgstr "a Ibanjirije"
-
-#: LYMessages.c:365
-#, fuzzy
-msgid "Current document has POST data."
-msgstr "Inyandiko Ibyatanzwe"
-
-#: LYMessages.c:366
-#, fuzzy
-msgid "Edit this document's URL: "
-msgstr "iyi"
-
-#: LYMessages.c:367
-#, fuzzy
-msgid "Edit the current link's URL: "
-msgstr "i KIGEZWEHO"
-
-#: LYMessages.c:368
-#, fuzzy
-msgid "You cannot edit File Management URLs"
-msgstr "Guhindura Idosiye"
-
-#: LYMessages.c:369
-#, fuzzy
-msgid "Enter a database query: "
-msgstr "a Ububikoshingiro Ikibazo#"
-
-#: LYMessages.c:370
-#, fuzzy
-msgid "Enter a whereis query: "
-msgstr "a Ikibazo#"
-
-#: LYMessages.c:371
-#, fuzzy
-msgid "Edit the current query: "
-msgstr "i KIGEZWEHO Ikibazo#"
-
-#: LYMessages.c:372
-#, fuzzy
-msgid "Edit the previous query: "
-msgstr "i Ibanjirije Ikibazo#"
-
-#: LYMessages.c:373
-#, fuzzy
-msgid "Edit a previous query: "
-msgstr "a Ibanjirije Ikibazo#"
-
-#. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:375
-#, fuzzy
-msgid "Use Control-R to resubmit the current query."
-msgstr "Kuri i KIGEZWEHO Ikibazo#"
-
-#: LYMessages.c:376
-#, fuzzy
-msgid "Edit the current shortcut: "
-msgstr "i KIGEZWEHO Iy'ibusamo"
-
-#: LYMessages.c:377
-#, fuzzy
-msgid "Edit the previous shortcut: "
-msgstr "i Ibanjirije Iy'ibusamo"
-
-#: LYMessages.c:378
-#, fuzzy
-msgid "Edit a previous shortcut: "
-msgstr "a Ibanjirije Iy'ibusamo"
-
-#: LYMessages.c:379
-#, fuzzy, c-format
-msgid "Key '%c' is not mapped to a jump file!"
-msgstr "ni OYA Kuri a Simbuka IDOSIYE"
-
-#: LYMessages.c:380
-#, fuzzy
-msgid "Cannot locate jump file!"
-msgstr "Simbuka IDOSIYE"
-
-#: LYMessages.c:381
-#, fuzzy
-msgid "Cannot open jump file!"
-msgstr "Gufungura Simbuka IDOSIYE"
-
-#: LYMessages.c:382
-#, fuzzy
-msgid "Error reading jump file!"
-msgstr "Simbuka IDOSIYE"
-
-#: LYMessages.c:383
-#, fuzzy
-msgid "Out of memory reading jump file!"
-msgstr "Bya Ububiko Simbuka IDOSIYE"
-
-#: LYMessages.c:384
-#, fuzzy
-msgid "Out of memory reading jump table!"
-msgstr "Bya Ububiko Simbuka imbonerahamwe#"
-
-#: LYMessages.c:385
-#, fuzzy
-msgid "No index is currently available."
-msgstr "Umubarendanga ni Bihari"
-
-#. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:387
-#, fuzzy
-msgid "Do you really want to go to the Main screen?"
-msgstr "Kuri Gyayo Kuri i Mugaragaza"
-
-#: LYMessages.c:388
-#, fuzzy
-msgid "You are already at main screen!"
-msgstr "ku Mugaragaza"
-
-#. #define NOT_ISINDEX
-#: LYMessages.c:390
-#, fuzzy
-msgid "Not a searchable indexed document -- press '/' to search for a text string"
-msgstr "a Inyandiko Kanda Kuri Gushaka kugirango a Umwandiko Ikurikiranyanyuguti"
-
-#. #define NO_OWNER
-#: LYMessages.c:392
-#, fuzzy
-msgid "No owner is defined for this file so you cannot send a comment"
-msgstr "ni kugirango iyi IDOSIYE Kohereza a Icyo wongeraho"
-
-#: LYMessages.c:393
-#, fuzzy, c-format
-msgid "No owner is defined. Use %s?"
-msgstr "ni"
-
-#: LYMessages.c:394
-#, fuzzy
-msgid "Do you wish to send a comment?"
-msgstr "Kuri Kohereza a Icyo wongeraho"
-
-#: LYMessages.c:395
-#, fuzzy
-msgid "Mail is disallowed so you cannot send a comment"
-msgstr "ni Kohereza a Icyo wongeraho"
-
-#: LYMessages.c:396
-#, fuzzy
-msgid "The 'e'dit command is currently disabled."
-msgstr "Komandi: ni Yahagaritswe"
-
-#: LYMessages.c:397
-#, fuzzy
-msgid "External editing is currently disabled."
-msgstr "ni Yahagaritswe"
-
-#: LYMessages.c:398
-#, fuzzy
-msgid "System error - failure to get status."
-msgstr "Ikosa Kuri Kubona Imimerere"
-
-#: LYMessages.c:399
-#, fuzzy
-msgid "No editor is defined!"
-msgstr "Muhinduzi ni"
-
-#: LYMessages.c:400
-#, fuzzy
-msgid "The 'p'rint command is currently disabled."
-msgstr "Komandi: ni Yahagaritswe"
-
-#: LYMessages.c:401
-#, fuzzy
-msgid "Document has no Toolbar links or Banner."
-msgstr "Oya amahuza Cyangwa"
-
-#: LYMessages.c:402
-#, fuzzy
-msgid "Unable to open traversal file."
-msgstr "Kuri Gufungura IDOSIYE"
-
-#: LYMessages.c:403
-#, fuzzy
-msgid "Unable to open traversal found file."
-msgstr "Kuri Gufungura Byabonetse IDOSIYE"
-
-#: LYMessages.c:404
-#, fuzzy
-msgid "Unable to open reject file."
-msgstr "Kuri Gufungura Kwanga IDOSIYE"
-
-#: LYMessages.c:405
-#, fuzzy
-msgid "Unable to open traversal errors output file"
-msgstr "Kuri Gufungura Amakosa Ibisohoka IDOSIYE"
-
-#: LYMessages.c:406
-msgid "TRAVERSAL WAS INTERRUPTED"
-msgstr ""
-
-#: LYMessages.c:407
-#, fuzzy
-msgid "Follow link (or goto link or page) number: "
-msgstr "Ihuza Cyangwa Ihuza Cyangwa Ipaji Umubare"
-
-#: LYMessages.c:408
-#, fuzzy
-msgid "Select option (or page) number: "
-msgstr "Ihitamo Cyangwa Ipaji Umubare"
-
-#: LYMessages.c:409
-#, fuzzy, c-format
-msgid "Option number %d already is current."
-msgstr "Umubare ni KIGEZWEHO"
-
-#. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:411
-#, fuzzy
-msgid "You are already at the end of this option list."
-msgstr "ku i Impera Bya iyi Ihitamo Urutonde"
-
-#. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:413
-#, fuzzy
-msgid "You are already at the beginning of this option list."
-msgstr "ku i Itangiriro Bya iyi Ihitamo Urutonde"
-
-#. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:415
-#, fuzzy, c-format
-msgid "You are already at page %d of this option list."
-msgstr "ku Ipaji Bya iyi Ihitamo Urutonde"
-
-#: LYMessages.c:416
-#, fuzzy
-msgid "You have entered an invalid option number."
-msgstr "Sibyo Ihitamo Umubare"
-
-#: LYMessages.c:417
-#, fuzzy
-msgid "** Bad HTML!!  Use -trace to diagnose. **"
-msgstr "**Kuri"
-
-#: LYMessages.c:418
-#, fuzzy
-msgid "Give name of file to save in"
-msgstr "Izina: Bya IDOSIYE Kuri Kubika in"
-
-#: LYMessages.c:419
-#, fuzzy
-msgid "Can't save data to file -- please run WWW locally"
-msgstr "Kubika Ibyatanzwe Kuri IDOSIYE Gukoresha"
-
-#: LYMessages.c:420
-#, fuzzy
-msgid "Can't open temporary file!"
-msgstr "Gufungura By'igihe gito IDOSIYE"
-
-#: LYMessages.c:421
-#, fuzzy
-msgid "Can't open output file!  Cancelling!"
-msgstr "Gufungura Ibisohoka IDOSIYE"
-
-#: LYMessages.c:422
-#, fuzzy
-msgid "Execution is disabled."
-msgstr "ni Yahagaritswe"
-
-#. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:424
-#, fuzzy, c-format
-msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
-msgstr "ni OYA Bikora kugirango iyi IDOSIYE i Ibikubiyemo Gukoresha"
-
-#. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:426
-#, fuzzy
-msgid "Execution capabilities are not compiled into this version."
-msgstr "OYA iyi Verisiyo"
-
-#: LYMessages.c:427
-#, fuzzy
-msgid "This file cannot be displayed on this terminal."
-msgstr "IDOSIYE ku iyi"
-
-#. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:429
-#, fuzzy
-msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
-msgstr "IDOSIYE ku iyi Cyangwa C"
-
-#: LYMessages.c:430
-#, fuzzy, c-format
-msgid "%s  D)ownload, or C)ancel"
-msgstr "%sCyangwa C"
-
-#: LYMessages.c:431
-#, fuzzy
-msgid "Cancelling file."
-msgstr "IDOSIYE"
-
-#: LYMessages.c:432
-#, fuzzy
-msgid "Retrieving file.  - PLEASE WAIT -"
-msgstr "IDOSIYE"
-
-#: LYMessages.c:433
-#, fuzzy
-msgid "Enter a filename: "
-msgstr "a Izina ry'idosiye:"
-
-#: LYMessages.c:434
-#, fuzzy
-msgid "Edit the previous filename: "
-msgstr "i Ibanjirije Izina ry'idosiye:"
-
-#: LYMessages.c:435
-#, fuzzy
-msgid "Edit a previous filename: "
-msgstr "a Ibanjirije Izina ry'idosiye:"
-
-#: LYMessages.c:436
-#, fuzzy
-msgid "Enter a new filename: "
-msgstr "a Gishya Izina ry'idosiye:"
-
-#: LYMessages.c:437
-#, fuzzy
-msgid "File name may not begin with a dot."
-msgstr "Idosiye Izina: Gicurasi OYA Na: a Akadomo"
-
-#: LYMessages.c:439
-#, fuzzy
-msgid "File exists.  Create higher version?"
-msgstr "Idosiye Verisiyo"
-
-#: LYMessages.c:441
-#, fuzzy
-msgid "File exists.  Overwrite?"
-msgstr "Gusimbuza."
-
-#: LYMessages.c:443
-#, fuzzy
-msgid "Cannot write to file."
-msgstr "Kwandika Kuri IDOSIYE"
-
-#: LYMessages.c:444
-#, fuzzy
-msgid "ERROR! - download command is misconfigured."
-msgstr "Gufungura Komandi: ni"
-
-#: LYMessages.c:445
-#, fuzzy
-msgid "Unable to download file."
-msgstr "Kuri Gufungura IDOSIYE"
-
-#: LYMessages.c:446
-#, fuzzy
-msgid "Reading directory..."
-msgstr "bushyinguro"
-
-#: LYMessages.c:447
-#, fuzzy
-msgid "Building directory listing..."
-msgstr "bushyinguro"
-
-#: LYMessages.c:448
-#, fuzzy
-msgid "Saving..."
-msgstr "Kubika%S"
-
-#: LYMessages.c:449
-#, fuzzy, c-format
-msgid "Could not edit file '%s'."
-msgstr "OYA Guhindura IDOSIYE"
-
-#: LYMessages.c:450
-#, fuzzy
-msgid "Unable to access document!"
-msgstr "Kuri Inyandiko"
-
-#: LYMessages.c:451
-#, fuzzy
-msgid "Could not access file."
-msgstr "OYA IDOSIYE"
-
-#: LYMessages.c:452
-#, fuzzy
-msgid "Could not access directory."
-msgstr "OYA bushyinguro"
-
-#: LYMessages.c:453
-#, fuzzy
-msgid "Could not load data."
-msgstr "OYA Ibirimo Ibyatanzwe"
-
-#. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:455
-#, fuzzy
-msgid "Lynx cannot currently (e)dit remote WWW files."
-msgstr "E Idosiye"
-
-#. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:457
-#, fuzzy
-msgid "This field cannot be (e)dited with an external editor."
-msgstr "Umwanya E Na: external Muhinduzi"
-
-#: LYMessages.c:458
-msgid "Bad rule"
-msgstr ""
-
-#: LYMessages.c:459
-msgid "Insufficient operands:"
-msgstr ""
-
-#: LYMessages.c:460
-#, fuzzy
-msgid "You are not authorized to edit this file."
-msgstr "OYA Kuri Guhindura iyi IDOSIYE"
-
-# sch/source\ui\app\menu.src:RID_MENU.WORKAROUND_22.SID_INSERT_TITLE.text
-#: LYMessages.c:461
-#, fuzzy
-msgid "Title: "
-msgstr "Umutwe..."
-
-# sfx2/source\dialog\mailwindow.src:RID_MAIL_WINDOW.FT_MAILWIN_SUBJECT.text
-#: LYMessages.c:462
-msgid "Subject: "
-msgstr "Ikivugwaho:"
-
-#: LYMessages.c:463
-#, fuzzy
-msgid "Username: "
-msgstr "Izina ry'ukoresha"
-
-# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_PASSWORD.text
-#: LYMessages.c:464
-#, fuzzy
-msgid "Password: "
-msgstr "Ijambobanga..."
-
-#: LYMessages.c:465
-#, fuzzy
-msgid "lynx: Username and Password required!!!"
-msgstr "Na Bya ngombwa"
-
-#: LYMessages.c:466
-#, fuzzy
-msgid "lynx: Password required!!!"
-msgstr "Bya ngombwa"
-
-#: LYMessages.c:467
-#, fuzzy
-msgid "Clear all authorization info for this session?"
-msgstr "Byose Ibisobanuro kugirango iyi Umukoro"
-
-#: LYMessages.c:468
-#, fuzzy
-msgid "Authorization info cleared."
-msgstr "Ibisobanuro"
-
-#: LYMessages.c:469
-#, fuzzy
-msgid "Authorization failed.  Retry?"
-msgstr "Wongereugerageze."
-
-#: LYMessages.c:470
-#, fuzzy
-msgid "cgi support has been disabled."
-msgstr "Gushigikira Yahagaritswe"
-
-#. #define CGI_NOT_COMPILED
-#: LYMessages.c:472
-#, fuzzy
-msgid "Lynxcgi capabilities are not compiled into this version."
-msgstr "OYA iyi Verisiyo"
-
-#: LYMessages.c:473
-#, fuzzy, c-format
-msgid "Sorry, no known way of converting %s to %s."
-msgstr "Oya Bya Guhindura.... Kuri"
-
-#: LYMessages.c:474
-#, fuzzy
-msgid "Unable to set up connection."
-msgstr "Kuri Gushyiraho Hejuru Ukwihuza"
-
-#: LYMessages.c:475
-#, fuzzy
-msgid "Unable to make connection"
-msgstr "Kuri Ubwoko Ukwihuza"
-
-#. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:477
-#, fuzzy
-msgid "Executable link rejected due to malformed request."
-msgstr "Ihuza Byanzwe Kuri Kubaza..."
-
-#. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:479
-#, fuzzy, c-format
-msgid "Executable link rejected due to `%c' character."
-msgstr "Ihuza Byanzwe Kuri Inyuguti"
-
-#. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:481
-msgid "Executable link rejected due to relative path string ('../')."
-msgstr ""
-
-#. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:483
-#, fuzzy
-msgid "Executable link rejected due to location or path."
-msgstr "Ihuza Byanzwe Kuri Ahantu Cyangwa Inzira"
-
-#: LYMessages.c:484
-#, fuzzy
-msgid "Mail access is disabled!"
-msgstr "ni Yahagaritswe"
-
-#. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:486
-#, fuzzy
-msgid "Only files and servers on the local host can be accessed."
-msgstr "Idosiye Na ku i Ubuturo birabonetse"
-
-#: LYMessages.c:487
-#, fuzzy
-msgid "Telnet access is disabled!"
-msgstr "ni Yahagaritswe"
-
-#. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:489
-#, fuzzy
-msgid "Telnet port specifications are disabled."
-msgstr "Umuyoboro Yahagaritswe"
-
-#: LYMessages.c:490
-#, fuzzy
-msgid "USENET news access is disabled!"
-msgstr "Amakuru ni Yahagaritswe"
-
-#: LYMessages.c:491
-#, fuzzy
-msgid "Rlogin access is disabled!"
-msgstr "ni Yahagaritswe"
-
-#: LYMessages.c:492
-#, fuzzy
-msgid "Ftp access is disabled!"
-msgstr "ni Yahagaritswe"
-
-#: LYMessages.c:493
-#, fuzzy
-msgid "There are no references from this document."
-msgstr "Oya Indango Bivuye iyi Inyandiko"
-
-#: LYMessages.c:494
-#, fuzzy
-msgid "There are only hidden links from this document."
-msgstr "gihishwe amahuza Bivuye iyi Inyandiko"
-
-#: LYMessages.c:496
-#, fuzzy
-msgid "Unable to open command file."
-msgstr "Kuri Gufungura Komandi: IDOSIYE"
-
-#: LYMessages.c:498
-msgid "News Post Cancelled!!!"
-msgstr ""
-
-#. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:500
-#, fuzzy
-msgid "Spawning your selected editor to edit news message"
-msgstr "Byahiswemo Muhinduzi Kuri Guhindura Amakuru Ubutumwa"
-
-#: LYMessages.c:501
-#, fuzzy
-msgid "Post this message?"
-msgstr "iyi Ubutumwa"
-
-# basctl/source\basicide\moduldlg.src:RID_TP_LIBS.RID_PB_APPEND.text
-#: LYMessages.c:502
-#, fuzzy, c-format
-msgid "Append '%s'?"
-msgstr "Kongeraho..."
-
-#: LYMessages.c:503
-#, fuzzy
-msgid "Posting to newsgroup(s)..."
-msgstr "Kuri Urubuga rw'amakuru S"
-
-#: LYMessages.c:505
-#, fuzzy
-msgid "*** You have unread mail. ***"
-msgstr "***Bidasomye Ubutumwa"
-
-#: LYMessages.c:507
-#, fuzzy
-msgid "*** You have mail. ***"
-msgstr "***Ubutumwa"
-
-#: LYMessages.c:509
-#, fuzzy
-msgid "*** You have new mail. ***"
-msgstr "***Gishya Ubutumwa"
-
-#: LYMessages.c:510
-#, fuzzy
-msgid "File insert cancelled!!!"
-msgstr "Idosiye Kongeramo Kureka"
-
-#: LYMessages.c:511
-#, fuzzy
-msgid "Not enough memory for file!"
-msgstr "Ububiko kugirango IDOSIYE"
-
-#: LYMessages.c:512
-#, fuzzy
-msgid "Can't open file for reading."
-msgstr "Gufungura IDOSIYE kugirango"
-
-#: LYMessages.c:513
-#, fuzzy
-msgid "File does not exist."
-msgstr "Idosiye OYA"
-
-#: LYMessages.c:514
-#, fuzzy
-msgid "File does not exist - reenter or cancel:"
-msgstr "Idosiye OYA Cyangwa Kureka"
-
-#: LYMessages.c:515
-#, fuzzy
-msgid "File is not readable."
-msgstr "Idosiye%S ntirisomeka"
-
-#: LYMessages.c:516
-#, fuzzy
-msgid "File is not readable - reenter or cancel:"
-msgstr "Idosiye ni OYA Cyangwa Kureka"
-
-#: LYMessages.c:517
-#, fuzzy
-msgid "Nothing to insert - file is 0-length."
-msgstr "Kuri Kongeramo IDOSIYE ni 0 Uburebure"
-
-#: LYMessages.c:518
-#, fuzzy
-msgid "Save request cancelled!!!"
-msgstr "Kubika Kubaza... Kureka"
-
-#: LYMessages.c:519
-#, fuzzy
-msgid "Mail request cancelled!!!"
-msgstr "Kubaza... Kureka"
-
-#. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:521
-#, fuzzy
-msgid "Viewing preparsed source.  Are you sure you want to mail it?"
-msgstr "Inkomoko Kuri Ubutumwa"
-
-#: LYMessages.c:522
-msgid "Please wait..."
-msgstr "Ba wihanganye..."
-
-#: LYMessages.c:523
-#, fuzzy
-msgid "Mailing file.  Please wait..."
-msgstr "IDOSIYE Tegereza"
-
-#: LYMessages.c:524
-#, fuzzy
-msgid "ERROR - Unable to mail file"
-msgstr "Kuri Ubutumwa IDOSIYE"
-
-#. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:526
-#, fuzzy, c-format
-msgid "File is %d screens long.  Are you sure you want to print?"
-msgstr "Idosiye ni Kuri Gucapa"
-
-#: LYMessages.c:527
-#, fuzzy
-msgid "Print request cancelled!!!"
-msgstr "Kubaza... Kureka"
-
-#: LYMessages.c:528
-#, fuzzy
-msgid "Press <return> to begin: "
-msgstr "Garuka Kuri"
-
-#: LYMessages.c:529
-#, fuzzy
-msgid "Press <return> to finish: "
-msgstr "Garuka Kuri Kurangiza"
-
-#. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:531
-#, fuzzy, c-format
-msgid "File is %d pages long.  Are you sure you want to print?"
-msgstr "Idosiye ni Amapaji Kuri Gucapa"
-
-#. #define CHECK_PRINTER
-#: LYMessages.c:533
-#, fuzzy
-msgid "Be sure your printer is on-line.  Press <return> to start printing:"
-msgstr "Mucapyi ni ku Umurongo Garuka Kuri Gutangira Icapa..."
-
-#: LYMessages.c:534
-#, fuzzy
-msgid "ERROR - Unable to allocate file space!!!"
-msgstr "Kuri IDOSIYE Umwanya"
-
-#: LYMessages.c:535
-#, fuzzy
-msgid "Unable to open tempfile"
-msgstr "Kuri Gufungura"
-
-#: LYMessages.c:536
-#, fuzzy
-msgid "Unable to open print options file"
-msgstr "Kuri Gufungura Gucapa Amahitamo IDOSIYE"
-
-#: LYMessages.c:537
-#, fuzzy
-msgid "Printing file.  Please wait..."
-msgstr "IDOSIYE Tegereza"
-
-#: LYMessages.c:538
-#, fuzzy
-msgid "Please enter a valid internet mail address: "
-msgstr "Injiza a Byemewe Interineti Ubutumwa Aderesi"
-
-#: LYMessages.c:539
-#, fuzzy
-msgid "ERROR! - printer is misconfigured!"
-msgstr "Mucapyi ni"
-
-#: LYMessages.c:540
-#, fuzzy
-msgid "Image map from POST response not available!"
-msgstr "Bivuye OYA Bihari"
-
-#: LYMessages.c:541
-#, fuzzy
-msgid "Misdirected client-side image MAP request!"
-msgstr "Umukiriya Ishusho Kubaza..."
-
-#: LYMessages.c:542
-#, fuzzy
-msgid "Client-side image MAP is not accessible!"
-msgstr "Ishusho ni OYA"
-
-#: LYMessages.c:543
-#, fuzzy
-msgid "No client-side image MAPs are available!"
-msgstr "Umukiriya Ishusho Bihari"
-
-#: LYMessages.c:544
-#, fuzzy
-msgid "Client-side image MAP is not available!"
-msgstr "Ishusho ni OYA Bihari"
-
-#. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:547
-#, fuzzy
-msgid "Screen height must be at least 24 lines for the Options menu!"
-msgstr "Ubuhagarike ku Imirongo kugirango i Ibikubiyemo"
-
-#. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:549
-#, fuzzy
-msgid "Screen height must be at least 23 lines for the Options menu!"
-msgstr "Ubuhagarike ku Imirongo kugirango i Ibikubiyemo"
-
-#. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:551
-#, fuzzy
-msgid "Screen height must be at least 22 lines for the Options menu!"
-msgstr "Ubuhagarike ku Imirongo kugirango i Ibikubiyemo"
-
-#: LYMessages.c:553
-#, fuzzy
-msgid "That key requires Advanced User mode."
-msgstr "Urufunguzo Ubwoko"
-
-#: LYMessages.c:554
-#, fuzzy, c-format
-msgid "Content-type: %s"
-msgstr "Ubwoko bw'ibikubiyemo"
-
-#: LYMessages.c:555
-msgid "Command: "
-msgstr "Komandi"
-
-#: LYMessages.c:556
-#, fuzzy
-msgid "Unknown or ambiguous command"
-msgstr "Cyangwa Komandi:"
-
-# goodies/source\filter.vcl\eps\dlgeps.src:DLG_EXPORT_EPS.GRP_VERSION.text
-#: LYMessages.c:557
-#, fuzzy
-msgid " Version "
-msgstr "Verisiyo"
-
-#: LYMessages.c:558
-#, fuzzy
-msgid " first"
-msgstr "Itangira"
-
-#: LYMessages.c:559
-msgid ", guessing..."
-msgstr ""
-
-#: LYMessages.c:560
-#, fuzzy
-msgid "Permissions for "
-msgstr "kugirango"
-
-# basctl/source\basicide\tbxctl.src:RID_TOOLBOX.SID_INSERT_SELECT.text
-#: LYMessages.c:561
-#, fuzzy
-msgid "Select "
-msgstr "Guhitamo"
-
-#: LYMessages.c:562
-#, fuzzy
-msgid "capital letter"
-msgstr "Ibaruwa..."
-
-#: LYMessages.c:563
-#, fuzzy
-msgid " of option line,"
-msgstr "Bya Ihitamo Umurongo"
-
-#: LYMessages.c:564
-#, fuzzy
-msgid " to save,"
-msgstr "Kuri Kubika"
-
-# officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Wizard.Memo.Elements.To.text
-#: LYMessages.c:565
-#, fuzzy
-msgid " to "
-msgstr "Kuri"
-
-#: LYMessages.c:566
-#, fuzzy
-msgid " or "
-msgstr "Cyangwa"
-
-#: LYMessages.c:567
-#, fuzzy
-msgid " index"
-msgstr "Umubarendanga"
-
-#: LYMessages.c:568
-#, fuzzy
-msgid " to return to Lynx."
-msgstr "Kuri Garuka Kuri"
-
-#: LYMessages.c:569
-msgid "Accept Changes"
-msgstr "emera ibihindutse/ibyahindutse"
-
-#: LYMessages.c:570
-msgid "Reset Changes"
-msgstr ""
-
-#: LYMessages.c:571
-#, fuzzy
-msgid "Left Arrow cancels changes"
-msgstr "Amahinduka"
-
-#: LYMessages.c:572
-#, fuzzy
-msgid "Save options to disk"
-msgstr "Kubika Amahitamo Kuri"
-
-#: LYMessages.c:573
-#, fuzzy
-msgid "Hit RETURN to accept entered data."
-msgstr "Kuri Kwemera Ibyatanzwe"
-
-#. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:575
-#, fuzzy
-msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
-msgstr "Kuri Kwemera Ibyatanzwe Ibyatanzwe Kuri i Mburabuzi"
-
-#: LYMessages.c:576
-#, fuzzy
-msgid "Value accepted!"
-msgstr "Byemewe"
-
-#. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:578
-#, fuzzy
-msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
-msgstr "Byemewe ni kugirango"
-
-#. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:580
-#, fuzzy
-msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
-msgstr "Byemewe ni kugirango"
-
-#: LYMessages.c:581
-#, fuzzy
-msgid "You are not allowed to change which editor to use!"
-msgstr "OYA Kuri Guhindura>> Muhinduzi Kuri Gukoresha"
-
-#: LYMessages.c:582
-#, fuzzy
-msgid "Failed to set DISPLAY variable!"
-msgstr "Kuri Gushyiraho IMPINDURAGACIRO"
-
-#: LYMessages.c:583
-#, fuzzy
-msgid "Failed to clear DISPLAY variable!"
-msgstr "Kuri Gusiba IMPINDURAGACIRO"
-
-#. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:585
-#, fuzzy
-msgid "You are not allowed to change the bookmark file!"
-msgstr "OYA Kuri Guhindura>> i Akamenyetso IDOSIYE"
-
-#: LYMessages.c:586
-#, fuzzy
-msgid "Terminal does not support color"
-msgstr "OYA Gushigikira Ibara"
-
-#: LYMessages.c:587
-#, fuzzy, c-format
-msgid "Your '%s' terminal does not support color."
-msgstr "OYA Gushigikira Ibara"
-
-#: LYMessages.c:588
-#, fuzzy
-msgid "Access to dot files is disabled!"
-msgstr "Kuri Akadomo Idosiye ni Yahagaritswe"
-
-#. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:590
-#, fuzzy
-msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
-msgstr "Ikurikiranyanyuguti OYA Cyangwa"
-
-#. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:592
-#, fuzzy
-msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
-msgstr "Cyangwa in Cyangwa nka"
-
-#. #define UA_CHANGE_DISABLED
-#: LYMessages.c:594
-#, fuzzy
-msgid "Changing of the User-Agent string is disabled!"
-msgstr "Bya i Ikurikiranyanyuguti ni Yahagaritswe"
-
-#. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:596
-#, fuzzy
-msgid "You are not allowed to change this setting."
-msgstr "OYA Kuri Guhindura>> iyi Igenamiterere"
-
-#: LYMessages.c:597
-msgid "Saving Options..."
-msgstr ""
-
-#: LYMessages.c:598
-msgid "Options saved!"
-msgstr ""
-
-#: LYMessages.c:599
-#, fuzzy
-msgid "Unable to save Options!"
-msgstr "Kuri Kubika"
-
-#: LYMessages.c:600
-#, fuzzy
-msgid " 'r' to return to Lynx "
-msgstr "'Kuri Garuka Kuri"
-
-#: LYMessages.c:601
-#, fuzzy
-msgid " '>' to save, or 'r' to return to Lynx "
-msgstr "'>'Kuri Kubika Cyangwa Kuri Garuka Kuri"
-
-#. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:603
-#, fuzzy
-msgid "Hit any key to change value; RETURN to accept."
-msgstr "Urufunguzo Kuri Guhindura>> Agaciro Kuri Kwemera"
-
-#: LYMessages.c:604
-#, fuzzy
-msgid "Error uncompressing temporary file!"
-msgstr "By'igihe gito IDOSIYE"
-
-#: LYMessages.c:605
-#, fuzzy
-msgid "Unsupported URL scheme!"
-msgstr "Igishusho"
-
-#: LYMessages.c:606
-#, fuzzy
-msgid "Unsupported data: URL!  Use SHOWINFO, for now."
-msgstr "Ibyatanzwe kugirango NONEAHA"
-
-#: LYMessages.c:607
-#, fuzzy
-msgid "Redirection limit of 10 URL's reached."
-msgstr "Bya 10"
-
-#: LYMessages.c:608
-#, fuzzy
-msgid "Illegal redirection URL received from server!"
-msgstr "BYAKIRIWE Bivuye Seriveri"
-
-#. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:610
-#, fuzzy, c-format
-msgid "Server asked for %d redirection of POST content to"
-msgstr "kugirango Bya Ibikubiyemo Kuri"
-
-#: LYMessages.c:613
-#, fuzzy
-msgid "P)roceed, use G)ET or C)ancel "
-msgstr "Gukoresha Cyangwa C"
-
-#: LYMessages.c:614
-#, fuzzy
-msgid "P)roceed, or C)ancel "
-msgstr "Cyangwa C"
-
-#. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:616
-#, fuzzy
-msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
-msgstr "Bya Ibikubiyemo U Gukoresha Cyangwa C"
-
-#. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:618
-#, fuzzy
-msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
-msgstr "Bya Ibikubiyemo U Cyangwa C"
-
-#. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:620
-#, fuzzy
-msgid "Document from Form with POST content.  Resubmit?"
-msgstr "Bivuye Na: Ibikubiyemo"
-
-#. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:622
-#, fuzzy, c-format
-msgid "Resubmit POST content to %s ?"
-msgstr "Ibikubiyemo Kuri"
-
-#. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:624
-#, fuzzy, c-format
-msgid "List from document with POST data.  Reload %s ?"
-msgstr "Kongerakuyitangiza."
-
-#. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:626
-#, fuzzy
-msgid "Document from POST action, HEAD may not be understood.  Proceed?"
-msgstr "Bivuye Igikorwa Gicurasi OYA"
-
-#. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:628
-#, fuzzy
-msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
-msgstr "Tanga Igikorwa ni Gicurasi OYA"
-
-#: LYMessages.c:629
-#, fuzzy
-msgid "Proceed without a username and password?"
-msgstr "a Izina ry'ukoresha Na Ijambobanga..."
-
-#: LYMessages.c:630
-#, c-format
-msgid "Proceed (%s)?"
-msgstr ""
-
-#: LYMessages.c:631
-#, fuzzy
-msgid "Cannot POST to this host."
-msgstr "Kuri iyi Ubuturo"
-
-#: LYMessages.c:632
-#, fuzzy
-msgid "POST not supported for this URL - ignoring POST data!"
-msgstr "OYA kugirango iyi Ibyatanzwe"
-
-#: LYMessages.c:633
-#, fuzzy
-msgid "Discarding POST data..."
-msgstr "Ibyatanzwe"
-
-#: LYMessages.c:634
-#, fuzzy
-msgid "Document will not be reloaded!"
-msgstr "OYA"
-
-#: LYMessages.c:635
-msgid "Location: "
-msgstr "Ahari:"
-
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\dochdl\dochdl.src:STR_NOGLOS2.text
-# #-#-#-#-#  sw.pot (PACKAGE VERSION)  #-#-#-#-#
-# sw/source\ui\uiview\view.src:STR_NOGLOS2.text
-#: LYMessages.c:636
-#, fuzzy, c-format
-msgid "'%s' not found!"
-msgstr "'%s'ntibyabonetse"
-
-#: LYMessages.c:637
-#, fuzzy
-msgid "Default Bookmark File"
-msgstr "Idosiye"
-
-#: LYMessages.c:638
-#, fuzzy
-msgid "Screen too small! (8x35 min)"
-msgstr "Gitoya GITO"
-
-#: LYMessages.c:639
-#, fuzzy
-msgid "Select destination or ^G to Cancel: "
-msgstr "Ishyika Cyangwa Kuri"
-
-#. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:641
-#, fuzzy
-msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
-msgstr "kugirango Ibikubiyemo Cyangwa Kuri Kureka"
-
-#. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:643
-#, fuzzy
-msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
-msgstr "in iyi Akamenyetso IDOSIYE Cyangwa C L C"
-
-#: LYMessages.c:644
-#, fuzzy
-msgid "Multiple bookmark support is not available."
-msgstr "Akamenyetso Gushigikira ni OYA Bihari"
-
-#: LYMessages.c:645
-#, fuzzy, c-format
-msgid " Select Bookmark (screen %d of %d)"
-msgstr "Mugaragaza Bya"
-
-#: LYMessages.c:646
-msgid "       Select Bookmark"
-msgstr ""
-
-#. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:648
-#, fuzzy, c-format
-msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
-msgstr "Na Bya 2."
-
-#. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:650
-#, fuzzy
-msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
-msgstr "Na"
-
-# scp/source\office\profile.lng:STR_DIR_MENU_WIZARD_BRIEF.text
-#: LYMessages.c:651
-#, fuzzy
-msgid "Letter: "
-msgstr "Ibaruwa..."
-
-#. #define USE_PATH_OFF_HOME
-#: LYMessages.c:654
-#, fuzzy
-msgid "Use a filepath off your login directory in SHELL syntax!"
-msgstr "a Bidakora Ifashayinjira bushyinguro in"
-
-#: LYMessages.c:656
-#, fuzzy
-msgid "Use a filepath off your home directory!"
-msgstr "a Bidakora Ku Ntangiriro bushyinguro"
-
-#. #define MAXLINKS_REACHED
-#: LYMessages.c:659
-#, fuzzy
-msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
-msgstr "amahuza Ipaji Ipaji Cyangwa Umurongo"
-
-#: LYMessages.c:660
-#, fuzzy
-msgid "No previously visited links available!"
-msgstr "amahuza Bihari"
-
-#: LYMessages.c:661
-msgid "Memory exhausted!  Program aborted!"
-msgstr ""
-
-#: LYMessages.c:662
-msgid "Memory exhausted!  Aborting..."
-msgstr ""
-
-#: LYMessages.c:663
-#, fuzzy
-msgid "Not enough memory!"
-msgstr "Ububiko ntibuhagije"
-
-#: LYMessages.c:664
-#, fuzzy
-msgid "Directory/File Manager not available"
-msgstr "Idosiye OYA Bihari"
-
-#: LYMessages.c:665
-#, fuzzy
-msgid "HREF in BASE tag is not an absolute URL."
-msgstr "in Itagi: ni OYA"
-
-#: LYMessages.c:666
-#, fuzzy
-msgid "Location URL is not absolute."
-msgstr "ni OYA"
-
-#: LYMessages.c:667
-#, fuzzy
-msgid "Refresh URL is not absolute."
-msgstr "ni OYA"
-
-#. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:669
-#, fuzzy
-msgid ""
-"You are sending a message with body to:\n"
-"  "
-msgstr "a Ubutumwa Na: Umubiri Kuri"
-
-#: LYMessages.c:670
-#, fuzzy
-msgid ""
-"You are sending a comment to:\n"
-"  "
-msgstr "a Icyo wongeraho Kuri"
-
-#: LYMessages.c:671
-#, fuzzy
-msgid ""
-"\n"
-" With copy to:\n"
-"  "
-msgstr ""
-"\n"
-"Gukoporora Kuri\n"
-"  "
-
-#: LYMessages.c:672
-#, fuzzy
-msgid ""
-"\n"
-" With copies to:\n"
-"  "
-msgstr ""
-"\n"
-"Amakopi Kuri\n"
-"  "
-
-#. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:674
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-"Use Ctrl-G to cancel if you do not want to send a message\n"
-msgstr ""
-"\n"
-"\n"
-"Kuri Kureka NIBA OYA Kuri Kohereza a\n"
-
-#. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:676
-#, fuzzy
-msgid ""
-"\n"
-" Please enter your name, or leave it blank to remain anonymous\n"
-msgstr ""
-"\n"
-"Injiza Izina: Cyangwa Ahatanditseho Kuri\n"
-
-#. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:678
-#, fuzzy
-msgid ""
-"\n"
-" Please enter a mail address or some other\n"
-msgstr ""
-"\n"
-"Injiza a Ubutumwa Aderesi Cyangwa\n"
-
-#. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:680
-#, fuzzy
-msgid " means to contact you, if you desire a response.\n"
-msgstr "Kuri Umuntu NIBA a\n"
-
-#: LYMessages.c:681
-#, fuzzy
-msgid ""
-"\n"
-" Please enter a subject line.\n"
-msgstr ""
-"\n"
-"Injiza a Ikivugwaho Umurongo\n"
-
-#. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:683
-#, fuzzy
-msgid ""
-"\n"
-" Enter a mail address for a CC of your message.\n"
-msgstr ""
-"\n"
-"a Ubutumwa Aderesi kugirango a Bya Ubutumwa\n"
-
-#: LYMessages.c:684
-#, fuzzy
-msgid " (Leave blank if you don't want a copy.)\n"
-msgstr "(Ahatanditseho NIBA a Gukoporora\n"
-
-#: LYMessages.c:685
-#, fuzzy
-msgid ""
-"\n"
-" Please review the message body:\n"
-"\n"
-msgstr ""
-"\n"
-"Isubiramo i Ubutumwa Umubiri\n"
-"\n"
-
-#: LYMessages.c:686
-#, fuzzy
-msgid ""
-"\n"
-"Press RETURN to continue: "
-msgstr ""
-"\n"
-"Kuri urifuzagukomeza"
-
-#: LYMessages.c:687
-#, fuzzy
-msgid ""
-"\n"
-"Press RETURN to clean up: "
-msgstr ""
-"\n"
-"Kuri GUSUKURA Hejuru"
-
-#: LYMessages.c:688
-#, fuzzy
-msgid " Use Control-U to erase the default.\n"
-msgstr "U Kuri i Mburabuzi\n"
-
-#: LYMessages.c:689
-#, fuzzy
-msgid ""
-"\n"
-" Please enter your message below."
-msgstr ""
-"\n"
-"Injiza Ubutumwa munsi"
-
-#. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
-#, fuzzy
-msgid ""
-"\n"
-" When you are done, press enter and put a single period (.)"
-msgstr ""
-"\n"
-"Byakozwe Kanda Injiza Na Gushyira a UMWE Igihe"
-
-#. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
-#, fuzzy
-msgid ""
-"\n"
-" on a line and press enter again."
-msgstr ""
-"\n"
-"ku a Umurongo Na Kanda Injiza"
-
-#. Cookies messages
-#. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:697
-#, fuzzy, c-format
-msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
-msgstr "%sS."
-
-#. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:699
-#, fuzzy, c-format
-msgid "Accept invalid cookie domain=%s for '%s'?"
-msgstr "Sibyo Urwego kugirango"
-
-#. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:701
-#, fuzzy, c-format
-msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
-msgstr "Sibyo Inzira Nka a Imbanziriza Bya"
-
-#: LYMessages.c:702
-#, fuzzy
-msgid "Allowing this cookie."
-msgstr "iyi"
-
-#: LYMessages.c:703
-#, fuzzy
-msgid "Rejecting this cookie."
-msgstr "iyi"
-
-#: LYMessages.c:704
-#, fuzzy
-msgid "The Cookie Jar is empty."
-msgstr "ni ubusa"
-
-#: LYMessages.c:705
-#, fuzzy
-msgid "The Cache Jar is empty."
-msgstr "ni ubusa"
-
-#. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:707
-#, fuzzy
-msgid "Activate links to gobble up cookies or entire domains,"
-msgstr "amahuza Kuri Hejuru Inyandikonyakwirema Cyangwa"
-
-#: LYMessages.c:708
-#, fuzzy
-msgid "or to change a domain's 'allow' setting."
-msgstr "Cyangwa Kuri Guhindura>> a Igenamiterere"
-
-#: LYMessages.c:709
-#, fuzzy
-msgid "(Cookies never allowed.)"
-msgstr "(Nta narimwe"
-
-#: LYMessages.c:710
-#, fuzzy
-msgid "(Cookies always allowed.)"
-msgstr "(Buri gihe"
-
-#: LYMessages.c:711
-#, fuzzy
-msgid "(Cookies allowed via prompt.)"
-msgstr "(Biturutse Urwinjiriro"
-
-#: LYMessages.c:712
-msgid "(Persistent Cookies.)"
-msgstr ""
-
-#: LYMessages.c:713
-#, fuzzy
-msgid "(No title.)"
-msgstr "(Umutwe"
-
-#: LYMessages.c:714
-#, fuzzy
-msgid "(No name.)"
-msgstr "(Izina:"
-
-#: LYMessages.c:715
-#, fuzzy
-msgid "(No value.)"
-msgstr "(Agaciro"
-
-#: LYMessages.c:716 src/LYOptions.c:2402
-msgid "None"
-msgstr "Ntacyo"
-
-#: LYMessages.c:717
-#, fuzzy
-msgid "(End of session.)"
-msgstr "(Impera Bya Umukoro"
-
-#: LYMessages.c:718
-#, fuzzy
-msgid "Delete this cookie?"
-msgstr "iyi"
-
-#: LYMessages.c:719
-msgid "The cookie has been eaten!"
-msgstr ""
-
-#: LYMessages.c:720
-#, fuzzy
-msgid "Delete this empty domain?"
-msgstr "iyi ubusa Urwego"
-
-#: LYMessages.c:721
-#, fuzzy
-msgid "The domain has been eaten!"
-msgstr "Urwego"
-
-#. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:723
-#, fuzzy
-msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
-msgstr "Inyandikonyakwirema Gushyiraho Kwemerera A Cyangwa C"
-
-#. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:725
-#, fuzzy
-msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
-msgstr "Urwego Gushyiraho Kwemerera A Cyangwa C"
-
-#: LYMessages.c:726
-#, fuzzy
-msgid "All cookies in the domain have been eaten!"
-msgstr "Inyandikonyakwirema in i Urwego"
-
-#: LYMessages.c:727
-#, fuzzy, c-format
-msgid "'A'lways allowing from domain '%s'."
-msgstr "'Bivuye Urwego"
-
-#: LYMessages.c:728
-#, fuzzy, c-format
-msgid "ne'V'er allowing from domain '%s'."
-msgstr "Bivuye Urwego"
-
-#: LYMessages.c:729
-#, fuzzy, c-format
-msgid "'P'rompting to allow from domain '%s'."
-msgstr "'Kuri Kwemerera Bivuye Urwego"
-
-#: LYMessages.c:730
-#, fuzzy
-msgid "Delete all cookies in this domain?"
-msgstr "Byose Inyandikonyakwirema in iyi Urwego"
-
-#: LYMessages.c:731
-#, fuzzy
-msgid "All of the cookies in the jar have been eaten!"
-msgstr "Bya i Inyandikonyakwirema in i"
-
-#: LYMessages.c:733
-#, fuzzy
-msgid "Port 19 not permitted in URLs."
-msgstr "OYA in"
-
-#: LYMessages.c:734
-#, fuzzy
-msgid "Port 25 not permitted in URLs."
-msgstr "25% OYA in"
-
-#: LYMessages.c:735
-#, fuzzy, c-format
-msgid "Port %lu not permitted in URLs."
-msgstr "OYA in"
-
-#: LYMessages.c:736
-#, fuzzy
-msgid "URL has a bad port field."
-msgstr "a Umuyoboro Umwanya"
-
-#: LYMessages.c:737
-#, fuzzy
-msgid "Maximum nesting of HTML elements exceeded."
-msgstr "Bya Ibintu"
-
-#: LYMessages.c:738
-#, fuzzy
-msgid "Bad partial reference!  Stripping lead dots."
-msgstr "Bituzuye Indango Utudomo"
-
-#: LYMessages.c:739
-#, fuzzy
-msgid "Trace Log open failed.  Trace off!"
-msgstr "Gufungura Byanze Bidakora"
-
-#: LYMessages.c:740
-msgid "Lynx Trace Log"
-msgstr ""
-
-#: LYMessages.c:741
-#, fuzzy
-msgid "No trace log has been started for this session."
-msgstr "LOG kugirango iyi Umukoro"
-
-#. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:743
-#, fuzzy
-msgid "The maximum temporary file count has been reached!"
-msgstr "Kinini By'igihe gito IDOSIYE IBARA"
-
-#. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:745
-#, fuzzy
-msgid "Form field value exceeds buffer length!  Trim the tail."
-msgstr "Umwanya Agaciro Uburebure i"
-
-#. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:747
-#, fuzzy
-msgid "Modified tail combined with head of form field value."
-msgstr "Na: Bya Ifishi Umwanya Agaciro"
-
-#. HTFile.c
-#: LYMessages.c:750
-msgid "Directory"
-msgstr "Ububiko"
-
-#: LYMessages.c:751
-#, fuzzy
-msgid "Directory browsing is not allowed."
-msgstr "ni OYA"
-
-#: LYMessages.c:752
-#, fuzzy
-msgid "Selective access is not enabled for this directory"
-msgstr "ni OYA Bikora kugirango iyi bushyinguro"
-
-#: LYMessages.c:753
-#, fuzzy
-msgid "Multiformat: directory scan failed."
-msgstr "bushyinguro Gusikana Byanze"
-
-#: LYMessages.c:754
-#, fuzzy
-msgid "This directory is not readable."
-msgstr "bushyinguro ni OYA"
-
-#: LYMessages.c:755
-#, fuzzy
-msgid "Can't access requested file."
-msgstr "IDOSIYE"
-
-#: LYMessages.c:756
-#, fuzzy
-msgid "Could not find suitable representation for transmission."
-msgstr "OYA Gushaka kugirango"
-
-#: LYMessages.c:757
-#, fuzzy
-msgid "Could not open file for decompression!"
-msgstr "OYA Gufungura IDOSIYE kugirango"
-
-# scp/source\office\dir.lng:STR_DIR_DATEIEN.text
-#: LYMessages.c:758
-#, fuzzy
-msgid "Files:"
-msgstr "Idosiye"
-
-# svx/source\gallery2\gallery.src:RID_SVXDLG_GALLERY_CBX.text
-#: LYMessages.c:759
-#, fuzzy
-msgid "Subdirectories:"
-msgstr "Ububiko bwungirije"
-
-# svtools/source\dialogs\filedlg2.src:STR_FILEDLG_DIR.text
-#: LYMessages.c:760
-#, fuzzy
-msgid " directory"
-msgstr "Ububiko"
-
-#: LYMessages.c:761
-#, fuzzy
-msgid "Up to "
-msgstr "Kuri"
-
-#: LYMessages.c:762
-#, fuzzy
-msgid "Current directory is "
-msgstr "bushyinguro ni"
-
-#. HTGopher.c
-#: LYMessages.c:765
-#, fuzzy
-msgid "No response from server!"
-msgstr "Bivuye Seriveri"
-
-#: LYMessages.c:766
-#, fuzzy
-msgid "CSO index"
-msgstr "Umubarendanga"
-
-#: LYMessages.c:767
-#, fuzzy
-msgid ""
-"\n"
-"This is a searchable index of a CSO database.\n"
-msgstr ""
-"\n"
-"ni a Umubarendanga Bya a Ububikoshingiro\n"
-
-#: LYMessages.c:768
-msgid "CSO Search Results"
-msgstr ""
-
-#: LYMessages.c:769
-#, fuzzy, c-format
-msgid "Seek fail on %s\n"
-msgstr "ku\n"
-
-#: LYMessages.c:770
-#, fuzzy
-msgid ""
-"\n"
-"Press the 's' key and enter search keywords.\n"
-msgstr ""
-"\n"
-"i Urufunguzo Na Injiza Gushaka Amagambo fatizo\n"
-
-#: LYMessages.c:771
-#, fuzzy
-msgid ""
-"\n"
-"This is a searchable Gopher index.\n"
-msgstr ""
-"\n"
-"ni a Umubarendanga\n"
-
-#: LYMessages.c:772
-#, fuzzy
-msgid "Gopher index"
-msgstr "Umubarendanga"
-
-#: LYMessages.c:773
-msgid "Gopher Menu"
-msgstr ""
-
-#: LYMessages.c:774
-#, fuzzy
-msgid " Search Results"
-msgstr "ibisubizo by'ishakisha"
-
-#: LYMessages.c:775
-#, fuzzy
-msgid "Sending CSO/PH request."
-msgstr "Kubaza..."
-
-#: LYMessages.c:776
-#, fuzzy
-msgid "Sending Gopher request."
-msgstr "Kubaza..."
-
-#: LYMessages.c:777
-#, fuzzy
-msgid "CSO/PH request sent; waiting for response."
-msgstr "Kubaza... Yoherejwe: Tegereza kugirango"
-
-#: LYMessages.c:778
-#, fuzzy
-msgid "Gopher request sent; waiting for response."
-msgstr "Kubaza... Yoherejwe: Tegereza kugirango"
-
-#: LYMessages.c:779
-#, fuzzy
-msgid ""
-"\n"
-"Please enter search keywords.\n"
-msgstr ""
-"\n"
-"Injiza Gushaka Amagambo fatizo\n"
-
-#: LYMessages.c:780
-#, fuzzy
-msgid ""
-"\n"
-"The keywords that you enter will allow you to search on a"
-msgstr ""
-"\n"
-"Amagambo fatizo Injiza Kwemerera Kuri Gushaka ku a"
-
-#: LYMessages.c:781
-#, fuzzy
-msgid " person's name in the database.\n"
-msgstr "Izina: in i Ububikoshingiro\n"
-
-#. HTNews.c
-#: LYMessages.c:784
-msgid "Connection closed ???"
-msgstr ""
-
-#: LYMessages.c:785
-#, fuzzy
-msgid "Cannot open temporary file for news POST."
-msgstr "Gufungura By'igihe gito IDOSIYE kugirango Amakuru"
-
-#: LYMessages.c:786
-#, fuzzy
-msgid "This client does not contain support for posting to news with SSL."
-msgstr "Umukiriya OYA Gushigikira kugirango Kuri Amakuru Na:"
-
-#. HTStyle.c
-#: LYMessages.c:789
-#, fuzzy, c-format
-msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
-msgstr "Akadomo\n"
-
-#: LYMessages.c:791
-#, c-format
-msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
-msgstr ""
-
-#: LYMessages.c:792
-#, fuzzy, c-format
-msgid "\t\tTab kind=%d at %.0f\n"
-msgstr "ku\n"
-
-#. HTTP.c
-#: LYMessages.c:795
-#, fuzzy
-msgid "Can't proceed without a username and password."
-msgstr "a Izina ry'ukoresha Na Ijambobanga..."
-
-#: LYMessages.c:796
-#, fuzzy
-msgid "Can't retry with authorization!  Contact the server's WebMaster."
-msgstr "Ongera ugerageze Na: i"
-
-#: LYMessages.c:797
-#, fuzzy
-msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
-msgstr "Ongera ugerageze Na: Porogisi i"
-
-#: LYMessages.c:798
-#, fuzzy
-msgid "Retrying with proxy authorization information."
-msgstr "Na: Porogisi Ibisobanuro"
-
-#: LYMessages.c:799
-#, fuzzy, c-format
-msgid "SSL error:%s-Continue?"
-msgstr "Ikosa Ubuturo Dukomeza"
-
-#. HTWAIS.c
-#: LYMessages.c:802
-#, fuzzy
-msgid "HTWAIS: Return message too large."
-msgstr "Ubutumwa Binini"
-
-#: LYMessages.c:803
-#, fuzzy
-msgid "Enter WAIS query: "
-msgstr "Ikibazo#"
-
-#. Miscellaneous status
-#: LYMessages.c:806
-#, fuzzy
-msgid "Retrying as HTTP0 request."
-msgstr "Nka Kubaza..."
-
-#: LYMessages.c:807
-#, fuzzy, c-format
-msgid "Transferred %d bytes"
-msgstr "Bayite"
-
-#: LYMessages.c:808
-#, fuzzy
-msgid "Data transfer complete"
-msgstr "Byuzuye"
-
-#: LYMessages.c:809
-#, fuzzy, c-format
-msgid "Error processing line %d of %s\n"
-msgstr "Inonosora Umurongo Bya\n"
-
-#. Lynx internal page titles
-#: LYMessages.c:812
-msgid "Address List Page"
-msgstr ""
-
-#: LYMessages.c:813
-msgid "Bookmark file"
-msgstr "Idosiye y'ibirango"
-
-#: LYMessages.c:814
-msgid "Configuration Definitions"
-msgstr ""
-
-#: LYMessages.c:815
-msgid "Cookie Jar"
-msgstr ""
-
-#: LYMessages.c:816
-msgid "Current Key Map"
-msgstr ""
-
-#: LYMessages.c:817
-#, fuzzy
-msgid "File Management Options"
-msgstr "Idosiye"
-
-#: LYMessages.c:818
-msgid "Download Options"
-msgstr ""
-
-#: LYMessages.c:819
-msgid "History Page"
-msgstr ""
-
-#: LYMessages.c:820
-msgid "Cache Jar"
-msgstr ""
-
-#: LYMessages.c:821
-msgid "List Page"
-msgstr ""
-
-#: LYMessages.c:822
-msgid "Lynx.cfg Information"
-msgstr ""
-
-#: LYMessages.c:823
-msgid "Converted Mosaic Hotlist"
-msgstr ""
-
-#: LYMessages.c:824
-msgid "Options Menu"
-msgstr ""
-
-#: LYMessages.c:825
-#, fuzzy
-msgid "File Permission Options"
-msgstr "Idosiye"
-
-#: LYMessages.c:826
-msgid "Printing Options"
-msgstr ""
-
-#: LYMessages.c:827
-#, fuzzy
-msgid "Information about the current document"
-msgstr "Ibyerekeye i KIGEZWEHO Inyandiko"
-
-#: LYMessages.c:828
-#, fuzzy
-msgid "Your recent statusline messages"
-msgstr "Ubutumwa"
-
-#: LYMessages.c:829
-msgid "Upload Options"
-msgstr ""
-
-#: LYMessages.c:830
-msgid "Visited Links Page"
-msgstr ""
-
-#. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:833
-msgid "See also"
-msgstr ""
-
-#: LYMessages.c:834
-msgid "your"
-msgstr ""
-
-#: LYMessages.c:835
-#, fuzzy
-msgid "for runtime options"
-msgstr "kugirango Amahitamo"
-
-#: LYMessages.c:836
-#, fuzzy
-msgid "compile time options"
-msgstr "Gukusanya Igihe Amahitamo"
-
-#: LYMessages.c:837
-#, fuzzy
-msgid "color-style configuration"
-msgstr "Iboneza"
-
-#: LYMessages.c:838
-msgid "latest release"
-msgstr ""
-
-#: LYMessages.c:839
-#, fuzzy
-msgid "pre-release version"
-msgstr "Byahawe imiterere mbere Verisiyo"
-
-#: LYMessages.c:840
-#, fuzzy
-msgid "development version"
-msgstr "Verisiyo"
-
-#. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:842
-#, fuzzy
-msgid ""
-"The following data were derived during the automatic configuration/build\n"
-"process of this copy of Lynx.  When reporting a bug, please include a copy\n"
-"of this page."
-msgstr "Ibyatanzwe i Byikoresha Iboneza Bya iyi Gukoporora Bya a Gushyiramo a iyi Ipaji"
-
-#. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:846
-#, fuzzy
-msgid ""
-"The following data were used as automatically-configured compile-time\n"
-"definitions when this copy of Lynx was built."
-msgstr "Ibyatanzwe Nka ku buryo bwikora Gukusanya Ryari: iyi Gukoporora Bya"
-
-#. #define DIRED_NOVICELINE
-#: LYMessages.c:851
-#, fuzzy
-msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
-msgstr "C E Ibikubiyemo U\n"
-
-#: LYMessages.c:852
-#, fuzzy
-msgid "Failed to obtain status of current link!"
-msgstr "Kuri Imimerere Bya KIGEZWEHO Ihuza"
-
-#. #define INVALID_PERMIT_URL
-#: LYMessages.c:855
-#, fuzzy
-msgid "Special URL only valid from current File Permission menu!"
-msgstr "Byemewe Bivuye KIGEZWEHO Idosiye Ibikubiyemo"
-
-#: LYMessages.c:859
-#, fuzzy
-msgid "External support is currently disabled."
-msgstr "Gushigikira ni Yahagaritswe"
-
-#. new with 2.8.4dev.21
-#: LYMessages.c:863
-#, fuzzy
-msgid "Changing working-directory is currently disabled."
-msgstr "bushyinguro ni Yahagaritswe"
-
-#: LYMessages.c:864
-msgid "Linewrap OFF!"
-msgstr ""
-
-#: LYMessages.c:865
-msgid "Linewrap ON!"
-msgstr ""
-
-#: LYMessages.c:866
-#, fuzzy
-msgid "Parsing nested-tables toggled OFF!  Reloading..."
-msgstr "Imbonerahamwe"
-
-#: LYMessages.c:867
-#, fuzzy
-msgid "Parsing nested-tables toggled ON!  Reloading..."
-msgstr "Imbonerahamwe"
-
-#: LYMessages.c:868
-#, fuzzy
-msgid "Shifting is disabled while line-wrap is in effect"
-msgstr "ni Yahagaritswe Umurongo Gufunika ni in INGARUKA"
-
-#: LYMessages.c:869
-#, fuzzy
-msgid "Trace not supported"
-msgstr "OYA"
-
-#: LYMessages.c:790
-#, fuzzy, c-format
-msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
-msgstr "Itangira Ibindi\n"
-
-#: WWW/Library/Implementation/HTAABrow.c:626
-#, fuzzy, c-format
-msgid "Username for '%s' at %s '%s%s':"
-msgstr "kugirango ku"
-
-#: WWW/Library/Implementation/HTAABrow.c:894
-#, fuzzy
-msgid "This client doesn't know how to compose proxy authorization information for scheme"
-msgstr "Umukiriya Kuri Himba: Porogisi Ibisobanuro kugirango Igishusho"
-
-#: WWW/Library/Implementation/HTAABrow.c:971
-#, fuzzy
-msgid "This client doesn't know how to compose authorization information for scheme"
-msgstr "Umukiriya Kuri Himba: Ibisobanuro kugirango Igishusho"
-
-#: WWW/Library/Implementation/HTAABrow.c:1079
-#, fuzzy, c-format
-msgid "Invalid header '%s%s%s%s%s'"
-msgstr "Umutwempangano"
-
-#: WWW/Library/Implementation/HTAABrow.c:1181
-#, fuzzy
-msgid "Proxy authorization required -- retrying"
-msgstr "Bya ngombwa"
-
-#: WWW/Library/Implementation/HTAABrow.c:1239
-msgid "Access without authorization denied -- retrying"
-msgstr ""
-
-#: WWW/Library/Implementation/HTAccess.c:688
-#, fuzzy
-msgid "Access forbidden by rule"
-msgstr "ku"
-
-#: WWW/Library/Implementation/HTAccess.c:783
-#, fuzzy
-msgid "Document with POST content not found in cache.  Resubmit?"
-msgstr "Na: Ibikubiyemo OYA Byabonetse in Ubwihisho"
-
-#: WWW/Library/Implementation/HTAccess.c:938
-msgid "Loading failed, use a previous copy."
-msgstr ""
-
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
-msgid "Loading incomplete."
-msgstr ""
-
-#: WWW/Library/Implementation/HTAccess.c:1078
-#, fuzzy, c-format
-msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
-msgstr "****Cyangwa IDOSIYE Umubare ku Ibirimo\n"
-
-#: WWW/Library/Implementation/HTAccess.c:1080
-#, fuzzy, c-format
-msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@nongnu.org!\n"
-msgstr "****Ikosa Ubutumwa Cyuzuye\n"
-
-#: WWW/Library/Implementation/HTAccess.c:1081
-#, c-format
-msgid "**** HTAccess: Status returned was: %d\n"
-msgstr ""
-
-#.
-#. * hack: if we fail in HTAccess.c
-#. * avoid duplicating URL, oh.
-#.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
-msgid "Can't Access"
-msgstr ""
-
-#: WWW/Library/Implementation/HTAccess.c:1095
-#, fuzzy
-msgid "Unable to access document."
-msgstr "Kuri Inyandiko"
-
-#: WWW/Library/Implementation/HTFTP.c:843
-#, fuzzy, c-format
-msgid "Enter password for user %s@%s:"
-msgstr "Ijambobanga... kugirango Ukoresha:"
-
-#: WWW/Library/Implementation/HTFTP.c:871
-#, fuzzy
-msgid "Unable to connect to FTP host."
-msgstr "Kuri Kwihuza Kuri Ubuturo"
-
-#: WWW/Library/Implementation/HTFTP.c:1152
-#, fuzzy
-msgid "close master socket"
-msgstr "Gufunga Mugenga"
-
-#: WWW/Library/Implementation/HTFTP.c:1214
-#, fuzzy
-msgid "socket for master socket"
-msgstr "kugirango Mugenga"
-
-#.
-#. * It's a symbolic link, does the user care about knowing if it is
-#. * symbolic?  I think so since it might be a directory.
-#.
-#: WWW/Library/Implementation/HTFTP.c:1733 WWW/Library/Implementation/HTFTP.c:2350
-msgid "Symbolic Link"
-msgstr ""
-
-#: WWW/Library/Implementation/HTFTP.c:2707
-#, fuzzy
-msgid "Receiving FTP directory."
-msgstr "bushyinguro"
-
-#: WWW/Library/Implementation/HTFTP.c:2843
-#, fuzzy, c-format
-msgid "Transferred %d bytes (%5d)"
-msgstr "Bayite"
-
-#: WWW/Library/Implementation/HTFTP.c:3194
-#, fuzzy
-msgid "connect for data"
-msgstr "Kwihuza kugirango Ibyatanzwe"
-
-#: WWW/Library/Implementation/HTFTP.c:3855
-#, fuzzy
-msgid "Receiving FTP file."
-msgstr "IDOSIYE"
-
-#: WWW/Library/Implementation/HTFinger.c:273
-#, fuzzy
-msgid "Could not set up finger connection."
-msgstr "OYA Gushyiraho Hejuru Ukwihuza"
-
-#: WWW/Library/Implementation/HTFinger.c:320
-#, fuzzy
-msgid "Could not load data (no sitename in finger URL)"
-msgstr "OYA Ibirimo Ibyatanzwe Oya in"
-
-#: WWW/Library/Implementation/HTFinger.c:326
-#, fuzzy
-msgid "Invalid port number - will only use port 79!"
-msgstr "Umuyoboro Umubare Gukoresha Umuyoboro"
-
-#: WWW/Library/Implementation/HTFinger.c:392
-#, fuzzy
-msgid "Could not access finger host."
-msgstr "OYA Ubuturo"
-
-#: WWW/Library/Implementation/HTFinger.c:400
-#, fuzzy
-msgid "No response from finger server."
-msgstr "Bivuye Seriveri"
-
-#: WWW/Library/Implementation/HTNews.c:426
-#, fuzzy, c-format
-msgid "Username for news host '%s':"
-msgstr "kugirango Amakuru Ubuturo"
-
-#: WWW/Library/Implementation/HTNews.c:479
-#, fuzzy
-msgid "Change username?"
-msgstr "Izina ry'ukoresha"
-
-#: WWW/Library/Implementation/HTNews.c:483
-#, fuzzy
-msgid "Username:"
-msgstr "Izina ry'ukoresha"
-
-#: WWW/Library/Implementation/HTNews.c:508
-#, fuzzy, c-format
-msgid "Password for news host '%s':"
-msgstr "kugirango Amakuru Ubuturo"
-
-#: WWW/Library/Implementation/HTNews.c:591
-#, fuzzy
-msgid "Change password?"
-msgstr "Guhindura Ijambobanga"
-
-#: WWW/Library/Implementation/HTNews.c:1711
-#, fuzzy, c-format
-msgid "No matches for: %s"
-msgstr "kugirango"
-
-#: WWW/Library/Implementation/HTNews.c:1761
-#, fuzzy
-msgid ""
-"\n"
-"No articles in this group.\n"
-msgstr ""
-"\n"
-"in iyi Itsinda\n"
-
-#: WWW/Library/Implementation/HTNews.c:1773
-#, fuzzy
-msgid ""
-"\n"
-"No articles in this range.\n"
-msgstr ""
-"\n"
-"in iyi Urutonde\n"
-
-#.
-#. * Set window title.
-#.
-#: WWW/Library/Implementation/HTNews.c:1786
-#, c-format
-msgid "%s,  Articles %d-%d"
-msgstr ""
-
-#: WWW/Library/Implementation/HTNews.c:1809
-msgid "Earlier articles"
-msgstr ""
-
-#: WWW/Library/Implementation/HTNews.c:1822
-#, fuzzy, c-format
-msgid ""
-"\n"
-"There are about %d articles currently available in %s, IDs as follows:\n"
-"\n"
-msgstr ""
-"\n"
-"Ibyerekeye Bihari in Nka\n"
-"\n"
-
-#: WWW/Library/Implementation/HTNews.c:1884
-#, fuzzy
-msgid "All available articles in "
-msgstr "Bihari in"
-
-#: WWW/Library/Implementation/HTNews.c:2098
-msgid "Later articles"
-msgstr ""
-
-#: WWW/Library/Implementation/HTNews.c:2121
-#, fuzzy
-msgid "Post to "
-msgstr "Kuri"
-
-#: WWW/Library/Implementation/HTNews.c:2342
-#, fuzzy
-msgid "This client does not contain support for SNEWS URLs."
-msgstr "Umukiriya OYA Gushigikira kugirango"
-
-#: WWW/Library/Implementation/HTNews.c:2550
-#, fuzzy
-msgid "No target for raw text!"
-msgstr "Intego kugirango Umwandiko"
-
-#: WWW/Library/Implementation/HTNews.c:2581
-#, fuzzy
-msgid "Connecting to NewsHost ..."
-msgstr "Kuri"
-
-#: WWW/Library/Implementation/HTNews.c:2633
-#, fuzzy, c-format
-msgid "Could not access %s."
-msgstr "OYA"
-
-#: WWW/Library/Implementation/HTNews.c:2739
-#, fuzzy, c-format
-msgid "Can't read news info.  News host %.20s responded: %.200s"
-msgstr "Gusoma Amakuru Ibisobanuro Ubuturo"
-
-#: WWW/Library/Implementation/HTNews.c:2743
-#, fuzzy, c-format
-msgid "Can't read news info, empty response from host %s"
-msgstr "Gusoma Amakuru Ibisobanuro ubusa Bivuye Ubuturo"
-
-#.
-#. * List available newsgroups.  - FM
-#.
-#: WWW/Library/Implementation/HTNews.c:2947
-#, fuzzy
-msgid "Reading list of available newsgroups."
-msgstr "Urutonde Bya Bihari Imbuga z'amakuru"
-
-#: WWW/Library/Implementation/HTNews.c:2968
-#, fuzzy
-msgid "Reading list of articles in newsgroup."
-msgstr "Urutonde Bya in Urubuga rw'amakuru"
-
-#.
-#. * Get an article from a news group.  - FM
-#.
-#: WWW/Library/Implementation/HTNews.c:2974
-#, fuzzy
-msgid "Reading news article."
-msgstr "Amakuru Ingingo"
-
-#: WWW/Library/Implementation/HTNews.c:3004
-#, fuzzy
-msgid "Sorry, could not load requested news."
-msgstr "OYA Ibirimo Amakuru"
-
-#: WWW/Library/Implementation/HTTCP.c:1282
-#, fuzzy
-msgid "Address has invalid port"
-msgstr "Sibyo Umuyoboro"
-
-#: WWW/Library/Implementation/HTTCP.c:1358
-#, fuzzy
-msgid "Address length looks invalid"
-msgstr "Uburebure Sibyo"
-
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
-#, fuzzy, c-format
-msgid "Unable to locate remote host %s."
-msgstr "Kuri Ubuturo"
-
-#. Not HTProgress, so warning won't be overwritten immediately;
-#. * but not HTAlert, because typically there will be other
-#. * alerts from the callers.  - kw
-#.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
-#, fuzzy, c-format
-msgid "Invalid hostname %s"
-msgstr "Izina ry'inturo:"
-
-#: WWW/Library/Implementation/HTTCP.c:1636
-#, fuzzy, c-format
-msgid "Making %s connection to %s"
-msgstr "Ukwihuza Kuri"
-
-#: WWW/Library/Implementation/HTTCP.c:1647
-#, fuzzy
-msgid "socket failed."
-msgstr "Byanze"
-
-#: WWW/Library/Implementation/HTTCP.c:1660
-#, fuzzy, c-format
-msgid "socket failed: family %d addr %s port %s."
-msgstr "Byanze Aderesi Umuyoboro"
-
-#: WWW/Library/Implementation/HTTCP.c:1684
-#, fuzzy
-msgid "Could not make connection non-blocking."
-msgstr "OYA Ubwoko Ukwihuza"
-
-#: WWW/Library/Implementation/HTTCP.c:1752
-#, fuzzy
-msgid "Connection failed (too many retries)."
-msgstr "Byanze"
-
-#: WWW/Library/Implementation/HTTCP.c:1945
-#, fuzzy
-msgid "Could not restore socket to blocking."
-msgstr "OYA Kugarura Kuri"
-
-#: WWW/Library/Implementation/HTTCP.c:2011
-#, fuzzy
-msgid "Socket read failed for 180,000 tries."
-msgstr "Gusoma Byanze kugirango 000"
-
-#: WWW/Library/Implementation/HTTP.c:84
-#, c-format
-msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:406
-#, fuzzy, c-format
-msgid "Address contains a username: %s"
-msgstr "Kirimo a Izina ry'ukoresha"
-
-#: WWW/Library/Implementation/HTTP.c:460
-#, c-format
-msgid "Certificate issued by: %s"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:620
-#, fuzzy
-msgid "This client does not contain support for HTTPS URLs."
-msgstr "Umukiriya OYA Gushigikira kugirango"
-
-#: WWW/Library/Implementation/HTTP.c:645
-#, fuzzy
-msgid "Unable to connect to remote host."
-msgstr "Kuri Kwihuza Kuri Ubuturo"
-
-#: WWW/Library/Implementation/HTTP.c:669
-#, fuzzy
-msgid "Retrying connection without TLS."
-msgstr "Ukwihuza"
-
-#: WWW/Library/Implementation/HTTP.c:714
-msgid "no issuer was found"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:716
-msgid "issuer is not a CA"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:718
-msgid "the certificate has no known issuer"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:720
-msgid "the certificate has been revoked"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:722
-msgid "the certificate is not trusted"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:807
-#, c-format
-msgid "Verified connection to %s (cert=%s)"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:855 WWW/Library/Implementation/HTTP.c:901
-#, c-format
-msgid "Verified connection to %s (subj=%s)"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:931
-msgid "Can't find common name in certificate"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:934
-#, fuzzy, c-format
-msgid "SSL error:host(%s)!=cert(%s)-Continue?"
-msgstr "Ikosa Ubuturo Dukomeza"
-
-#: WWW/Library/Implementation/HTTP.c:947
-#, c-format
-msgid "UNVERIFIED connection to %s (cert=%s)"
-msgstr ""
-
-#: WWW/Library/Implementation/HTTP.c:956
-#, fuzzy, c-format
-msgid "Secure %d-bit %s (%s) HTTP connection"
-msgstr "Ukwihuza"
-
-#: WWW/Library/Implementation/HTTP.c:1426
-#, fuzzy
-msgid "Sending HTTP request."
-msgstr "Kubaza..."
-
-#: WWW/Library/Implementation/HTTP.c:1465
-#, fuzzy
-msgid "Unexpected network write error; connection aborted."
-msgstr "urusobe Kwandika Ikosa Ukwihuza"
-
-#: WWW/Library/Implementation/HTTP.c:1471
-#, fuzzy
-msgid "HTTP request sent; waiting for response."
-msgstr "Kubaza... Yoherejwe: Tegereza kugirango"
-
-#: WWW/Library/Implementation/HTTP.c:1539
-#, fuzzy
-msgid "Unexpected network read error; connection aborted."
-msgstr "urusobe Gusoma Ikosa Ukwihuza"
-
-#.
-#. * HTTP/1.1 Informational statuses.
-#. * 100 Continue.
-#. * 101 Switching Protocols.
-#. * > 101 is unknown.
-#. * We should never get these, and they have only the status
-#. * line and possibly other headers, so we'll deal with them by
-#. * showing the full header to the user as text/plain.  - FM
-#.
-#: WWW/Library/Implementation/HTTP.c:1733
-msgid "Got unexpected Informational Status."
-msgstr ""
-
-#.
-#. * Reset Content.  The server has fulfilled the request but
-#. * nothing is returned and we should reset any form
-#. * content.  We'll instruct the user to do that, and
-#. * restore the current document.  - FM
-#.
-#: WWW/Library/Implementation/HTTP.c:1767
-msgid "Request fulfilled.  Reset Content."
-msgstr ""
-
-#. Not Modified
-#.
-#. * We didn't send an "If-Modified-Since" header, so this
-#. * status is inappropriate.  We'll deal with it by showing
-#. * the full header to the user as text/plain.  - FM
-#.
-#: WWW/Library/Implementation/HTTP.c:1884
-#, fuzzy
-msgid "Got unexpected 304 Not Modified status."
-msgstr "Imimerere"
-
-#: WWW/Library/Implementation/HTTP.c:1947
-#, fuzzy
-msgid "Redirection of POST content requires user approval."
-msgstr "Bya Ibikubiyemo Ukoresha:"
-
-#: WWW/Library/Implementation/HTTP.c:1962
-#, fuzzy
-msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
-msgstr "Ibikubiyemo Nka\n"
-
-#: WWW/Library/Implementation/HTTP.c:2004
-#, fuzzy
-msgid "Retrying with access authorization information."
-msgstr "Na: Ibisobanuro"
-
-#: WWW/Library/Implementation/HTTP.c:2016
-#, fuzzy
-msgid "Show the 401 message body?"
-msgstr "i Ubutumwa Umubiri"
-
-#: WWW/Library/Implementation/HTTP.c:2059
-#, fuzzy
-msgid "Show the 407 message body?"
-msgstr "i Ubutumwa Umubiri"
-
-#.
-#. * Bad or unknown server_status number.  Take a chance and hope
-#. * there is something to display.  - FM
-#.
-#: WWW/Library/Implementation/HTTP.c:2159
-#, fuzzy
-msgid "Unknown status reply from server!"
-msgstr "Imimerere Subiza Bivuye Seriveri"
-
-#: WWW/Library/Implementation/HTTelnet.c:113
-#, fuzzy, c-format
-msgid "remote %s session:"
-msgstr "Umukoro"
-
-#: WWW/Library/Implementation/HTWAIS.c:162
-#, fuzzy
-msgid "Could not connect to WAIS server."
-msgstr "OYA Kwihuza Kuri Seriveri"
-
-#: WWW/Library/Implementation/HTWAIS.c:170
-#, fuzzy
-msgid "Could not open WAIS connection for reading."
-msgstr "OYA Gufungura Ukwihuza kugirango"
-
-#: WWW/Library/Implementation/HTWAIS.c:192
-#, fuzzy
-msgid "Diagnostic code is "
-msgstr "ITEGEKONGENGA ni"
-
-#: WWW/Library/Implementation/HTWAIS.c:464
-#, fuzzy
-msgid "Index "
-msgstr "Umubarendanga"
-
-#: WWW/Library/Implementation/HTWAIS.c:468
-#, fuzzy, c-format
-msgid " contains the following %d item%s relevant to \""
-msgstr "Kirimo i Ikintu Byagombwa Kuri"
-
-#: WWW/Library/Implementation/HTWAIS.c:476
-#, fuzzy
-msgid "The first figure after each entry is its relative score, "
-msgstr "Itangira Nyuma Icyinjijwe ni Bifitanye isano"
-
-#: WWW/Library/Implementation/HTWAIS.c:477
-#, fuzzy
-msgid "the second is the number of lines in the item."
-msgstr "i ISEGONDA ni i Umubare Bya Imirongo in i Ikintu"
-
-#: WWW/Library/Implementation/HTWAIS.c:519
-#, fuzzy
-msgid " (bad file name)"
-msgstr "(IDOSIYE Izina:"
-
-#: WWW/Library/Implementation/HTWAIS.c:545
-#, fuzzy
-msgid "(bad doc id)"
-msgstr "(ID"
-
-#: WWW/Library/Implementation/HTWAIS.c:561
-#, fuzzy
-msgid "(Short Header record, can't display)"
-msgstr "(Icyabitswe Kugaragaza"
-
-#: WWW/Library/Implementation/HTWAIS.c:568
-#, fuzzy
-msgid ""
-"\n"
-"Long Header record, can't display\n"
-msgstr ""
-"\n"
-"Icyabitswe\n"
-"\n"
-
-#: WWW/Library/Implementation/HTWAIS.c:575
-msgid ""
-"\n"
-"Text record\n"
-msgstr ""
-
-#: WWW/Library/Implementation/HTWAIS.c:584
-#, fuzzy
-msgid ""
-"\n"
-"Headline record, can't display\n"
-msgstr ""
-"\n"
-"Icyabitswe\n"
-
-#: WWW/Library/Implementation/HTWAIS.c:592
-#, fuzzy
-msgid ""
-"\n"
-"Code record, can't display\n"
-msgstr ""
-"\n"
-"Icyabitswe\n"
-
-#: WWW/Library/Implementation/HTWAIS.c:696
-#, fuzzy
-msgid "Syntax error in WAIS URL"
-msgstr "Ikosa in"
-
-#: WWW/Library/Implementation/HTWAIS.c:768
-msgid " (WAIS Index)"
-msgstr ""
-
-#: WWW/Library/Implementation/HTWAIS.c:775
-msgid "WAIS Index: "
-msgstr ""
-
-#: WWW/Library/Implementation/HTWAIS.c:781
-#, fuzzy
-msgid "This is a link for searching the "
-msgstr "ni a Ihuza kugirango Ishakisha i"
-
-#: WWW/Library/Implementation/HTWAIS.c:785
-msgid " WAIS Index.\n"
-msgstr ""
-
-#: WWW/Library/Implementation/HTWAIS.c:814
-#, fuzzy
-msgid ""
-"\n"
-"Enter the 's'earch command and then specify search words.\n"
-msgstr ""
-"\n"
-"i Komandi: Na Hanyuma Gushaka Amagambo\n"
-
-#: WWW/Library/Implementation/HTWAIS.c:836
-#, fuzzy
-msgid " (in "
-msgstr "(in"
-
-#: WWW/Library/Implementation/HTWAIS.c:845
-#, fuzzy
-msgid "WAIS Search of \""
-msgstr "Bya"
-
-#: WWW/Library/Implementation/HTWAIS.c:849
-#, fuzzy
-msgid "\" in: "
-msgstr "\"in"
-
-#: WWW/Library/Implementation/HTWAIS.c:864
-#, fuzzy
-msgid "HTWAIS: Request too large."
-msgstr "Binini"
-
-#: WWW/Library/Implementation/HTWAIS.c:873
-#, fuzzy
-msgid "Searching WAIS database..."
-msgstr "Ububikoshingiro"
-
-#: WWW/Library/Implementation/HTWAIS.c:883
-msgid "Search interrupted."
-msgstr ""
-
-#: WWW/Library/Implementation/HTWAIS.c:934
-#, fuzzy
-msgid "Can't convert format of WAIS document"
-msgstr "GUHINDURA Imiterere Bya Inyandiko"
-
-#: WWW/Library/Implementation/HTWAIS.c:978
-msgid "HTWAIS: Request too long."
-msgstr ""
-
-#.
-#. * Actually do the transaction given by request_message.
-#.
-#: WWW/Library/Implementation/HTWAIS.c:992
-#, fuzzy
-msgid "Fetching WAIS document..."
-msgstr "Inyandiko"
-
-#. display_search_response(target, retrieval_response,
-#. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1031
-#, fuzzy
-msgid "No text was returned!\n"
-msgstr "Umwandiko\n"
-
-#: WWW/Library/Implementation/HTWSRC.c:296
-#, fuzzy
-msgid " NOT GIVEN in source file; "
-msgstr "in Inkomoko IDOSIYE"
-
-#: WWW/Library/Implementation/HTWSRC.c:319
-#, fuzzy
-msgid " WAIS source file"
-msgstr "Inkomoko IDOSIYE"
-
-# basctl/source\basicide\macrodlg.src:RID_MACROCHOOSER.RID_TXT_DESCRIPTION.text
-#: WWW/Library/Implementation/HTWSRC.c:326
-#, fuzzy
-msgid " description"
-msgstr "Isobanuramiterere"
-
-#: WWW/Library/Implementation/HTWSRC.c:336
-#, fuzzy
-msgid "Access links"
-msgstr "amahuza"
-
-#: WWW/Library/Implementation/HTWSRC.c:357
-msgid "Direct access"
-msgstr ""
-
-#. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:360
-#, fuzzy
-msgid " (or via proxy server, if defined)"
-msgstr "(Cyangwa Biturutse Porogisi Seriveri NIBA"
-
-#: WWW/Library/Implementation/HTWSRC.c:375
-msgid "Maintainer"
-msgstr ""
-
-#: WWW/Library/Implementation/HTWSRC.c:383
-msgid "Host"
-msgstr "Ubuturo"
-
-#: src/GridText.c:705
-#, fuzzy
-msgid "Memory exhausted, display interrupted!"
-msgstr "Kugaragaza"
-
-#: src/GridText.c:710
-#, fuzzy
-msgid "Memory exhausted, will interrupt transfer!"
-msgstr "Hagarikira aho"
-
-#: src/GridText.c:3654
-msgid " *** MEMORY EXHAUSTED ***"
-msgstr ""
-
-#: src/GridText.c:6089 src/GridText.c:6096 src/LYList.c:239
-#, fuzzy
-msgid "unknown field or link"
-msgstr "Kitazwi Umwanya Cyangwa Ihuza"
-
-#: src/GridText.c:6105
-#, fuzzy
-msgid "text entry field"
-msgstr "Umwandiko Icyinjijwe Umwanya"
-
-#: src/GridText.c:6108
-#, fuzzy
-msgid "password entry field"
-msgstr "Ijambobanga... Icyinjijwe Umwanya"
-
-#: src/GridText.c:6111
-msgid "checkbox"
-msgstr ""
-
-# svx/source\form\fmexpl.src:RID_FMSHELL_CONVERSIONMENU.SID_FM_CONVERTTO_RADIOBUTTON.text
-#: src/GridText.c:6114
-#, fuzzy
-msgid "radio button"
-msgstr "Buto Radiyo"
-
-#: src/GridText.c:6117
-#, fuzzy
-msgid "submit button"
-msgstr "akabuto ko gutanga"
-
-#: src/GridText.c:6120
-#, fuzzy
-msgid "reset button"
-msgstr "akabuto ko gutangira bushya"
-
-#: src/GridText.c:6123
-#, fuzzy
-msgid "popup menu"
-msgstr "Ibikubiyemo"
-
-#: src/GridText.c:6126
-#, fuzzy
-msgid "hidden form field"
-msgstr "gihishwe Ifishi Umwanya"
-
-#: src/GridText.c:6129
-#, fuzzy
-msgid "text entry area"
-msgstr "Umwandiko Icyinjijwe Ubuso"
-
-#: src/GridText.c:6132
-#, fuzzy
-msgid "range entry field"
-msgstr "Urutonde Icyinjijwe Umwanya"
-
-#: src/GridText.c:6135
-#, fuzzy
-msgid "file entry field"
-msgstr "IDOSIYE Icyinjijwe Umwanya"
-
-#: src/GridText.c:6138
-#, fuzzy
-msgid "text-submit field"
-msgstr "Umwandiko Tanga Umwanya"
-
-#: src/GridText.c:6141
-#, fuzzy
-msgid "image-submit button"
-msgstr "Ishusho Tanga Akabuto"
-
-#: src/GridText.c:6144
-#, fuzzy
-msgid "keygen field"
-msgstr "Umwanya"
-
-#: src/GridText.c:6147
-#, fuzzy
-msgid "unknown form field"
-msgstr "Kitazwi Ifishi Umwanya"
-
-#: src/GridText.c:10320
-#, fuzzy
-msgid "Can't open file for uploading"
-msgstr "Gufungura IDOSIYE kugirango"
-
-#: src/GridText.c:11479
-#, c-format
-msgid "Submitting %s"
-msgstr ""
-
-#. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
-msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
-msgstr ""
-
-#. don't show previous state
-#: src/GridText.c:12669
-#, fuzzy
-msgid "Wrap lines to fit displayed area?"
-msgstr "Imirongo Kuri Ubuso"
-
-#: src/GridText.c:12721
-#, fuzzy
-msgid "Very long lines have been wrapped!"
-msgstr "Imirongo"
-
-#: src/GridText.c:13226
-#, fuzzy
-msgid "Very long lines have been truncated!"
-msgstr "Imirongo"
-
-# sfx2/source\appl\sfx.src:STR_BYTES.text
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
-#, fuzzy
-msgid "bytes"
-msgstr "Bayite"
-
-#.
-#. * If we know the total size of the file, we can compute
-#. * a percentage, and show a corresponding progress bar.
-#.
-#: src/HTAlert.c:300 src/HTAlert.c:324
-#, fuzzy, c-format
-msgid "Read %s of data"
-msgstr "Bya Ibyatanzwe"
-
-#: src/HTAlert.c:321
-#, fuzzy, c-format
-msgid "Read %s of %s of data"
-msgstr "Bya Bya Ibyatanzwe"
-
-#: src/HTAlert.c:330
-#, fuzzy, c-format
-msgid ", %s/sec"
-msgstr ",%s/isogonda"
-
-#: src/HTAlert.c:342
-#, fuzzy, c-format
-msgid " (stalled for %s)"
-msgstr "(kugirango"
-
-#: src/HTAlert.c:346
-#, c-format
-msgid ", ETA %s"
-msgstr ""
-
-#: src/HTAlert.c:368
-#, fuzzy
-msgid " (Press 'z' to abort)"
-msgstr "(Kuri Kureka"
-
-#. Meta-note: don't move the following note from its place right
-#. in front of the first gettext().  As it is now, it should
-#. automatically appear in generated lynx.pot files. - kw
-#.
-#. NOTE TO TRANSLATORS:  If you provide a translation for "yes", lynx
-#. * will take the first byte of the translation as a positive response
-#. * to Yes/No questions.  If you provide a translation for "no", lynx
-#. * will take the first byte of the translation as a negative response
-#. * to Yes/No questions.  For both, lynx will also try to show the
-#. * first byte in the prompt as a character, instead of (y) or (n),
-#. * respectively.  This will not work right for multibyte charsets!
-#. * Don't translate "yes" and "no" for CJK character sets (or translate
-#. * them to "yes" and "no").  For a translation using UTF-8, don't
-#. * translate if the translation would begin with anything but a 7-bit
-#. * (US_ASCII) character.  That also means do not translate if the
-#. * translation would begin with anything but a 7-bit character, if
-#. * you use a single-byte character encoding (a charset like ISO-8859-n)
-#. * but anticipate that the message catalog may be used re-encoded in
-#. * UTF-8 form.
-#. * For translations using other character sets, you may also wish to
-#. * leave "yes" and "no" untranslated, if using (y) and (n) is the
-#. * preferred behavior.
-#. * Lynx will also accept y Y n N as responses unless there is a conflict
-#. * with the first letter of the "yes" or "no" translation.
-#.
-#: src/HTAlert.c:406 src/HTAlert.c:454
-msgid "yes"
-msgstr "Yego"
-
-#: src/HTAlert.c:409 src/HTAlert.c:455
-#, fuzzy
-msgid "no"
-msgstr "Oya"
-
-#.
-#. * Special-purpose workaround for gettext support (we should do
-#. * this in a more general way) -TD
-#. *
-#. * NOTE TO TRANSLATORS:  If the prompt has been rendered into
-#. * another language, and if yes/no are distinct, assume the
-#. * translator can make an ordered list in parentheses with one
-#. * capital letter for each as we assumed in HTConfirmDefault().
-#. * The list has to be in the same order as in the original message,
-#. * and the four capital letters chosen to not match those in the
-#. * original unless they have the same position.
-#. *
-#. * Example:
-#. * (Y/N/Always/neVer)              - English (original)
-#. * (O/N/Toujours/Jamais)           - French
-#.
-#: src/HTAlert.c:911
-msgid "Y/N/A/V"
-msgstr ""
-
-#: src/HTML.c:5911
-msgid "Description:"
-msgstr "Igaragaza Imiterere:"
-
-#: src/HTML.c:5916
-msgid "(none)"
-msgstr "(ntacyo)"
-
-#: src/HTML.c:5920
-msgid "Filepath:"
-msgstr ""
-
-#: src/HTML.c:5926
-#, fuzzy
-msgid "(unknown)"
-msgstr "(Itazwi>"
-
-#: src/HTML.c:7353
-#, fuzzy
-msgid "Document has only hidden links.  Use the 'l'ist command."
-msgstr "gihishwe amahuza i Komandi:"
-
-#: src/HTML.c:7852
-#, fuzzy
-msgid "Source cache error - disk full?"
-msgstr "Ubwihisho Ikosa"
-
-#: src/HTML.c:7865
-#, fuzzy
-msgid "Source cache error - not enough memory!"
-msgstr "Ubwihisho Ikosa OYA Ububiko"
-
-#: src/LYBookmark.c:164
-#, fuzzy
-msgid ""
-"     This file is an HTML representation of the X Mosaic hotlist file.\n"
-"     Outdated or invalid links may be removed by using the\n"
-"     remove bookmark command, it is usually the 'R' key but may have\n"
-"     been remapped by you or your system administrator."
-msgstr ""
-"IDOSIYE ni Bya i IDOSIYE Cyangwa Sibyo amahuza Gicurasi Cyavanyweho ku ikoresha Gukuraho... Akamenyetso Komandi: ni i Urufunguzo "
-"Gicurasi ku Cyangwa Sisitemu umuyobozi/ uyobora"
-
-#: src/LYBookmark.c:371
-#, fuzzy, c-format
-msgid ""
-"     You can delete links by the 'R' key<br>\n"
-"<ol>\n"
-msgstr "Gusiba amahuza ku i Urufunguzo\n"
-
-#: src/LYBookmark.c:374
-#, fuzzy
-msgid ""
-"     You can delete links using the remove bookmark command.  It is usually\n"
-"     the 'R' key but may have been remapped by you or your system\n"
-"     administrator."
-msgstr "Gusiba amahuza ikoresha i Gukuraho... Akamenyetso Komandi: ni i Urufunguzo Gicurasi ku Cyangwa umuyobozi/ uyobora"
-
-#: src/LYBookmark.c:378
-#, fuzzy
-msgid ""
-"     This file also may be edited with a standard text editor to delete\n"
-"     outdated or invalid links, or to change their order."
-msgstr "IDOSIYE Gicurasi Na: a Bisanzwe Umwandiko Muhinduzi Kuri Cyangwa Sibyo amahuza Cyangwa Kuri Guhindura>> Itondekanya"
-
-#: src/LYBookmark.c:381
-#, fuzzy
-msgid ""
-"Note: if you edit this file manually\n"
-"      you should not change the format within the lines\n"
-"      or add other HTML markup.\n"
-"      Make sure any bookmark link is saved as a single line."
-msgstr ""
-"NIBA Guhindura iyi IDOSIYE OYA Guhindura>> i Imiterere muri i Cyangwa Kongeramo Ikindi Akamenyetso Ihuza ni Nka a UMWE Umurongo"
-
-#: src/LYBookmark.c:677
-#, fuzzy, c-format
-msgid "File may be recoverable from %s during this session"
-msgstr "Idosiye Gicurasi Bivuye iyi Umukoro"
-
-#: src/LYCgi.c:159
-#, c-format
-msgid "Do you want to execute \"%s\"?"
-msgstr ""
-
-#.
-#. * Neither the path as given nor any components examined by backing up
-#. * were stat()able.  - kw
-#.
-#: src/LYCgi.c:274
-#, fuzzy
-msgid "Unable to access cgi script"
-msgstr "Kuri IYANDIKA"
-
-#: src/LYCgi.c:699 src/LYCgi.c:702
-msgid "Good Advice"
-msgstr ""
-
-#: src/LYCgi.c:706
-#, fuzzy
-msgid "An excellent http server for VMS is available via"
-msgstr "HTTP Seriveri kugirango ni Bihari Biturutse"
-
-#: src/LYCgi.c:713
-#, fuzzy
-msgid "this link"
-msgstr "iyi Ihuza"
-
-#: src/LYCgi.c:717
-#, fuzzy
-msgid "It provides state of the art CGI script support.\n"
-msgstr "Leta Bya i IYANDIKA Gushigikira\n"
-
-#: src/LYClean.c:122
-#, fuzzy
-msgid "Exiting via interrupt:"
-msgstr "Biturutse Hagarikira aho"
-
-#: src/LYCookie.c:2461
-#, fuzzy
-msgid "(from a previous session)"
-msgstr "(Bivuye a Ibanjirije Umukoro"
-
-#: src/LYCookie.c:2522
-msgid "Maximum Gobble Date:"
-msgstr ""
-
-#: src/LYCookie.c:2562
-msgid "Internal"
-msgstr "By'imbere"
-
-#: src/LYCookie.c:2563
-#, fuzzy
-msgid "cookie_domain_flag_set error, aborting program"
-msgstr "Ikosa Porogaramu"
-
-#: src/LYCurses.c:1088
-#, fuzzy
-msgid "Terminal initialisation failed - unknown terminal type?"
-msgstr "Byanze Kitazwi Ubwoko"
-
-#: src/LYCurses.c:1546
-msgid "Terminal ="
-msgstr ""
-
-#: src/LYCurses.c:1550
-#, fuzzy
-msgid "You must use a vt100, 200, etc. terminal with this program."
-msgstr "Gukoresha a 200 Na: iyi Porogaramu"
-
-#: src/LYCurses.c:1599
-#, fuzzy
-msgid "Your Terminal type is unknown!"
-msgstr "Ubwoko ni Kitazwi"
-
-#: src/LYCurses.c:1600
-#, fuzzy
-msgid "Enter a terminal type:"
-msgstr "a Ubwoko"
-
-#: src/LYCurses.c:1614
-msgid "TERMINAL TYPE IS SET TO"
-msgstr ""
-
-#: src/LYCurses.c:2127
-#, fuzzy, c-format
-msgid ""
-"\n"
-"A Fatal error has occurred in %s Ver. %s\n"
-msgstr ""
-"\n"
-"A Ikosa in\n"
-
-#: src/LYCurses.c:2130
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Please notify your system administrator to confirm a bug, and if\n"
-"confirmed, to notify the lynx-dev list.  Bug reports should have concise\n"
-"descriptions of the command and/or URL which causes the problem, the\n"
-"operating system name with version number, the TCPIP implementation, the\n"
-"TRACEBACK if it can be captured, and any other relevant information.\n"
-msgstr ""
-"\n"
-"Sisitemu umuyobozi/ uyobora Kuri Kwemeza a Na Kuri i Urutonde Raporo Bya i Komandi: Na Cyangwa i Sisitemu Izina: Na: Verisiyo "
-"Umubare i NIBA Na Ikindi Byagombwa Ibisobanuro\n"
-
-#: src/LYEdit.c:266
-#, fuzzy, c-format
-msgid "Error starting editor, %s"
-msgstr "Inonosora Umurongo Bya"
-
-#: src/LYEdit.c:269
-#, fuzzy
-msgid "Editor killed by signal"
-msgstr "ku"
-
-#: src/LYEdit.c:274
-#, fuzzy, c-format
-msgid "Editor returned with error status %s"
-msgstr "Na: Ikosa Imimerere"
-
-#: src/LYDownload.c:504
-#, fuzzy
-msgid "Downloaded link:"
-msgstr "Ihuza"
-
-#: src/LYDownload.c:509
-#, fuzzy
-msgid "Suggested file name:"
-msgstr "IDOSIYE Izina:"
-
-#: src/LYDownload.c:514
-#, fuzzy
-msgid "Standard download options:"
-msgstr "Gufungura Amahitamo"
-
-#: src/LYDownload.c:515
-#, fuzzy
-msgid "Download options:"
-msgstr "Amahitamo"
-
-#: src/LYDownload.c:531
-#, fuzzy
-msgid "Save to disk"
-msgstr "Kubika Kuri"
-
-#: src/LYDownload.c:545
-#, fuzzy
-msgid "View temporary file"
-msgstr "i IDOSIYE"
-
-#: src/LYDownload.c:552
-#, fuzzy
-msgid "Save to disk disabled."
-msgstr "Kubika Kuri Yahagaritswe"
-
-#: src/LYDownload.c:556 src/LYPrint.c:1310
-msgid "Local additions:"
-msgstr ""
-
-#: src/LYDownload.c:567 src/LYUpload.c:211
-msgid "No Name Given"
-msgstr ""
-
-#: src/LYHistory.c:672
-#, fuzzy
-msgid "You selected:"
-msgstr "Byahiswemo"
-
-#: src/LYHistory.c:696 src/LYHistory.c:925
-#, fuzzy
-msgid "(no address)"
-msgstr "(Oya Aderesi"
-
-#: src/LYHistory.c:700
-#, fuzzy
-msgid " (internal)"
-msgstr "(By'imbere"
-
-#: src/LYHistory.c:702
-#, fuzzy
-msgid " (was internal)"
-msgstr "(By'imbere"
-
-#: src/LYHistory.c:800
-msgid " (From History)"
-msgstr ""
-
-#: src/LYHistory.c:845
-#, fuzzy
-msgid "You visited (POSTs, bookmark, menu and list files excluded):"
-msgstr "Akamenyetso Ibikubiyemo Na Urutonde Idosiye"
-
-#: src/LYHistory.c:1138
-#, fuzzy
-msgid "(No messages yet)"
-msgstr "(Ubutumwa"
-
-#: src/LYLeaks.c:220
-#, fuzzy
-msgid "Invalid pointer detected."
-msgstr "Mweretsi"
-
-#: src/LYLeaks.c:222 src/LYLeaks.c:260
-msgid "Sequence:"
-msgstr ""
-
-#: src/LYLeaks.c:225 src/LYLeaks.c:263
-#, fuzzy
-msgid "Pointer:"
-msgstr "Mweretsi"
-
-#: src/LYLeaks.c:234 src/LYLeaks.c:241 src/LYLeaks.c:282
-#, fuzzy
-msgid "FileName:"
-msgstr "Izina ry'idosiye:"
-
-#: src/LYLeaks.c:237 src/LYLeaks.c:244 src/LYLeaks.c:285 src/LYLeaks.c:296
-msgid "LineCount:"
-msgstr ""
-
-#: src/LYLeaks.c:258
-msgid "Memory leak detected."
-msgstr ""
-
-# sfx2/source\dialog\mgetempl.src:TP_MANAGE_STYLES.GB_DESC.text
-#: src/LYLeaks.c:266
-#, fuzzy
-msgid "Contains:"
-msgstr "Kirimo"
-
-#: src/LYLeaks.c:279
-msgid "ByteSize:"
-msgstr ""
-
-#: src/LYLeaks.c:293
-msgid "realloced:"
-msgstr ""
-
-#: src/LYLeaks.c:314
-#, fuzzy
-msgid "Total memory leakage this run:"
-msgstr "Ububiko iyi Gukoresha"
-
-#: src/LYLeaks.c:317
-msgid "Peak allocation"
-msgstr ""
-
-#: src/LYLeaks.c:318
-msgid "Bytes allocated"
-msgstr ""
-
-#: src/LYLeaks.c:319
-msgid "Total mallocs"
-msgstr ""
-
-#: src/LYLeaks.c:320
-msgid "Total frees"
-msgstr ""
-
-#: src/LYList.c:84
-#, fuzzy
-msgid "References in "
-msgstr "in"
-
-#: src/LYList.c:87
-#, fuzzy
-msgid "this document:"
-msgstr "iyi Inyandiko"
-
-#: src/LYList.c:93
-#, fuzzy
-msgid "Visible links:"
-msgstr "amahuza"
-
-#: src/LYList.c:194 src/LYList.c:295
-#, fuzzy
-msgid "Hidden links:"
-msgstr "amahuza"
-
-#: src/LYList.c:332
-msgid "References"
-msgstr "Irebero"
-
-#: src/LYList.c:336
-#, fuzzy
-msgid "Visible links"
-msgstr "amahuza"
-
-#: src/LYLocal.c:269
-#, fuzzy, c-format
-msgid "Unable to get status of '%s'."
-msgstr "Kuri Kubona Imimerere Bya"
-
-#: src/LYLocal.c:303
-#, fuzzy
-msgid "The selected item is not a file or a directory!  Request ignored."
-msgstr "Byahiswemo Ikintu ni OYA a IDOSIYE Cyangwa a bushyinguro"
-
-#: src/LYLocal.c:371
-#, fuzzy, c-format
-msgid "Unable to %s due to system error!"
-msgstr "Kuri Kuri Sisitemu Ikosa"
-
-#: src/LYLocal.c:405
-#, fuzzy, c-format
-msgid "Probable failure to %s due to system error!"
-msgstr "Kuri Kuri Sisitemu Ikosa"
-
-# padmin/source\padialog.src:RID_PADIALOG.RID_PA_BTN_DEL.text
-#: src/LYLocal.c:467 src/LYLocal.c:488
-#, fuzzy, c-format
-msgid "remove %s"
-msgstr "Gukuraho..."
-
-#: src/LYLocal.c:506
-#, c-format
-msgid "touch %s"
-msgstr ""
-
-#: src/LYLocal.c:534
-#, fuzzy, c-format
-msgid "move %s to %s"
-msgstr "Kwimura Kuri"
-
-#: src/LYLocal.c:575
-#, fuzzy
-msgid "There is already a directory with that name!  Request ignored."
-msgstr "ni a bushyinguro Na: Izina:"
-
-#: src/LYLocal.c:577
-#, fuzzy
-msgid "There is already a file with that name!  Request ignored."
-msgstr "ni a IDOSIYE Na: Izina:"
-
-#: src/LYLocal.c:579
-#, fuzzy
-msgid "The specified name is already in use!  Request ignored."
-msgstr "Izina: ni in Gukoresha"
-
-#: src/LYLocal.c:590
-msgid "Destination has different owner!  Request denied."
-msgstr ""
-
-#: src/LYLocal.c:593
-#, fuzzy
-msgid "Destination is not a valid directory!  Request denied."
-msgstr "ni OYA a Byemewe bushyinguro"
-
-#: src/LYLocal.c:615
-#, fuzzy
-msgid "Remove all tagged files and directories?"
-msgstr "Byose Idosiye Na ububiko bw'amaderese"
-
-#: src/LYLocal.c:673
-#, fuzzy
-msgid "Enter new location for tagged items: "
-msgstr "Gishya Ahantu kugirango"
-
-#: src/LYLocal.c:743
-msgid "Path too long"
-msgstr ""
-
-#: src/LYLocal.c:774
-#, fuzzy
-msgid "Source and destination are the same location - request ignored!"
-msgstr "Na Ishyika i Ahantu Kubaza..."
-
-#: src/LYLocal.c:831
-#, fuzzy
-msgid "Enter new name for directory: "
-msgstr "Gishya Izina: kugirango bushyinguro"
-
-#: src/LYLocal.c:833
-#, fuzzy
-msgid "Enter new name for file: "
-msgstr "Gishya Izina: kugirango IDOSIYE"
-
-#: src/LYLocal.c:845
-#, fuzzy
-msgid "Illegal character (path-separator) found! Request ignored."
-msgstr "Inyuguti Inzira Mutandukanya Byabonetse"
-
-#: src/LYLocal.c:895
-#, fuzzy
-msgid "Enter new location for directory: "
-msgstr "Gishya Ahantu kugirango bushyinguro"
-
-#: src/LYLocal.c:901
-#, fuzzy
-msgid "Enter new location for file: "
-msgstr "Gishya Ahantu kugirango IDOSIYE"
-
-#: src/LYLocal.c:928
-#, fuzzy
-msgid "Unexpected failure - unable to find trailing path separator"
-msgstr "Kuri Gushaka Inzira Mutandukanya"
-
-#: src/LYLocal.c:948
-#, fuzzy
-msgid "Source and destination are the same location!  Request ignored!"
-msgstr "Na Ishyika i Ahantu"
-
-#: src/LYLocal.c:995
-#, fuzzy
-msgid "Modify name, location, or permission (n, l, or p): "
-msgstr "Izina: Ahantu Cyangwa N L Cyangwa P"
-
-#: src/LYLocal.c:997
-#, fuzzy
-msgid "Modify name or location (n or l): "
-msgstr "Izina: Cyangwa Ahantu N Cyangwa L"
-
-#.
-#. * Code for changing ownership needed here.
-#.
-#: src/LYLocal.c:1026
-#, fuzzy
-msgid "This feature not yet implemented!"
-msgstr "OYA"
-
-#: src/LYLocal.c:1046
-#, fuzzy
-msgid "Enter name of file to create: "
-msgstr "Izina: Bya IDOSIYE Kuri Kurema"
-
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
-#, fuzzy
-msgid "Illegal redirection \"//\" found! Request ignored."
-msgstr "Byabonetse"
-
-#: src/LYLocal.c:1082
-#, fuzzy
-msgid "Enter name for new directory: "
-msgstr "Izina: kugirango Gishya bushyinguro"
-
-#: src/LYLocal.c:1122
-#, fuzzy
-msgid "Create file or directory (f or d): "
-msgstr "IDOSIYE Cyangwa bushyinguro F Cyangwa D"
-
-#: src/LYLocal.c:1164
-#, fuzzy, c-format
-msgid "Remove directory '%s'?"
-msgstr "IDOSIYE"
-
-# svtools/source\dialogs\filedlg2.src:STR_FILEDLG_DIR.text
-#: src/LYLocal.c:1167
-#, fuzzy
-msgid "Remove directory?"
-msgstr "Ububiko"
-
-#: src/LYLocal.c:1172
-#, fuzzy, c-format
-msgid "Remove file '%s'?"
-msgstr "IDOSIYE"
-
-#: src/LYLocal.c:1174
-#, fuzzy
-msgid "Remove file?"
-msgstr "IDOSIYE"
-
-#: src/LYLocal.c:1179
-#, fuzzy, c-format
-msgid "Remove symbolic link '%s'?"
-msgstr "Ihuza"
-
-#: src/LYLocal.c:1181
-#, fuzzy
-msgid "Remove symbolic link?"
-msgstr "Ihuza"
-
-#: src/LYLocal.c:1276
-#, fuzzy
-msgid "Sorry, don't know how to permit non-UNIX files yet."
-msgstr "Kuri Idosiye"
-
-#: src/LYLocal.c:1306
-#, fuzzy
-msgid "Unable to open permit options file"
-msgstr "Kuri Gufungura Amahitamo IDOSIYE"
-
-#: src/LYLocal.c:1336
-#, fuzzy
-msgid "Specify permissions below:"
-msgstr "Uruhushya munsi"
-
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
-msgid "Owner:"
-msgstr ""
-
-#: src/LYLocal.c:1353
-msgid "Group"
-msgstr "Itsinda"
-
-#: src/LYLocal.c:1369
-#, fuzzy
-msgid "Others:"
-msgstr "Ibindi:"
-
-#: src/LYLocal.c:1387
-#, fuzzy
-msgid "form to permit"
-msgstr "Ifishi Kuri"
-
-#: src/LYLocal.c:1482
-#, fuzzy
-msgid "Invalid mode format."
-msgstr "Ubwoko Imiterere"
-
-#: src/LYLocal.c:1486
-#, fuzzy
-msgid "Invalid syntax format."
-msgstr "Imiterere"
-
-#: src/LYLocal.c:1668
-#, fuzzy
-msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
-msgstr "IDOSIYE in i bushyinguro"
-
-#: src/LYLocal.c:1858
-#, fuzzy
-msgid "NULL URL pointer"
-msgstr "Mweretsi"
-
-#: src/LYLocal.c:1940
-#, fuzzy, c-format
-msgid "Executing %s "
-msgstr "Gukora: %s"
-
-#: src/LYLocal.c:1943
-#, fuzzy
-msgid "Executing system command. This might take a while."
-msgstr "Sisitemu Komandi: a"
-
-#: src/LYLocal.c:2015
-#, fuzzy
-msgid "Current directory:"
-msgstr "bushyinguro"
-
-# sc/source\ui\dbgui\dapitype.src:RID_SCDLG_DAPITYPE.BTN_SELECTION.text
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
-#, fuzzy
-msgid "Current selection:"
-msgstr "Ihitamo rigezweho"
-
-#: src/LYLocal.c:2022
-#, fuzzy
-msgid "Nothing currently selected."
-msgstr "Byahiswemo"
-
-#: src/LYLocal.c:2038
-#, fuzzy
-msgid "tagged item:"
-msgstr "Ikintu"
-
-#: src/LYLocal.c:2039
-msgid "tagged items:"
-msgstr ""
-
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
-#, fuzzy
-msgid "Illegal filename; request ignored."
-msgstr "Izina ry'idosiye: Kubaza..."
-
-#. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
-#, fuzzy
-msgid "Install in the selected directory not permitted."
-msgstr "in i Byahiswemo bushyinguro OYA"
-
-#: src/LYLocal.c:2300
-#, fuzzy
-msgid "The selected item is not a directory!  Request ignored."
-msgstr "Byahiswemo Ikintu ni OYA a bushyinguro"
-
-#: src/LYLocal.c:2309
-#, fuzzy
-msgid "Just a moment, ..."
-msgstr "a"
-
-#: src/LYLocal.c:2326
-#, fuzzy
-msgid "Error building install args"
-msgstr "Kwinjiza porogaramu"
-
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
-#, fuzzy, c-format
-msgid "Source and target are the same: %s"
-msgstr "Na Intego i"
-
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
-#, fuzzy, c-format
-msgid "Already in target directory: %s"
-msgstr "in Intego bushyinguro"
-
-# setup2/source\ui\pages\vefun.src:RESID_PAGE_PAGEHAVEFUN.STR_TITLE.text
-#: src/LYLocal.c:2397
-#, fuzzy
-msgid "Installation complete"
-msgstr "Iyinjizaporogaramu ryarangiye"
-
-#: src/LYLocal.c:2584
-#, fuzzy
-msgid "Temporary URL or list would be too long."
-msgstr "Cyangwa Urutonde"
-
-#: src/LYMail.c:520
-msgid "Sending"
-msgstr ""
-
-#: src/LYMail.c:1006
-#, fuzzy, c-format
-msgid "The link   %s :?: %s \n"
-msgstr "Ihuza\n"
-
-#: src/LYMail.c:1008
-#, c-format
-msgid "called \"%s\"\n"
-msgstr ""
-
-#: src/LYMail.c:1009
-#, fuzzy, c-format
-msgid "in the file \"%s\" called \"%s\"\n"
-msgstr "in i IDOSIYE\n"
-
-#: src/LYMail.c:1010
-#, fuzzy
-msgid "was requested but was not available."
-msgstr "OYA Bihari"
-
-#: src/LYMail.c:1011
-#, fuzzy
-msgid "Thought you might want to know."
-msgstr "Kuri"
-
-#: src/LYMail.c:1013
-#, fuzzy
-msgid "This message was automatically generated by"
-msgstr "Ubutumwa ku buryo bwikora ku"
-
-#: src/LYMail.c:1728
-msgid "No system mailer configured"
-msgstr ""
-
-#: src/LYMain.c:1022
-#, fuzzy
-msgid "No Winsock found, sorry."
-msgstr "Byabonetse"
-
-#: src/LYMain.c:1225
-#, fuzzy
-msgid "You MUST define a valid TMP or TEMP area!"
-msgstr "Kugaragaza... a Byemewe Cyangwa Ubuso"
-
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
-#, fuzzy
-msgid "No such directory"
-msgstr "bushyinguro"
-
-#: src/LYMain.c:1463
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Configuration file \"%s\" is not available.\n"
-"\n"
-msgstr ""
-"\n"
-"IDOSIYE ni OYA Bihari\n"
-"\n"
-
-#: src/LYMain.c:1473
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Lynx character sets not declared.\n"
-"\n"
-msgstr ""
-"\n"
-"Inyuguti OYA\n"
-
-#: src/LYMain.c:1502
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Lynx edit map not declared.\n"
-"\n"
-msgstr ""
-"\n"
-"Guhindura OYA\n"
-
-#: src/LYMain.c:1578
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Lynx file \"%s\" is not available.\n"
-"\n"
-msgstr ""
-"\n"
-"IDOSIYE ni OYA Bihari\n"
-
-#: src/LYMain.c:1653
-#, c-format
-msgid "Ignored %d characters from standard input.\n"
-msgstr ""
-
-#: src/LYMain.c:1655
-#, c-format
-msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
-msgstr ""
-
-#: src/LYMain.c:1803
-msgid "Warning:"
-msgstr "Iburira:"
-
-#: src/LYMain.c:2371
-#, fuzzy
-msgid "persistent cookies state will be changed in next session only."
-msgstr "Inyandikonyakwirema Leta Byahinduwe in Komeza>> Umukoro"
-
-#: src/LYMain.c:2616 src/LYMain.c:2661
-#, 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:3180
-#, fuzzy, c-format
-msgid "%s Version %s (%s)"
-msgstr "Verisiyo"
-
-#: src/LYMain.c:3218
-#, fuzzy, c-format
-msgid "Built on %s %s %s\n"
-msgstr "ku\n"
-
-#: src/LYMain.c:3240
-msgid "Copyrights held by the Lynx Developers Group,"
-msgstr ""
-
-#: src/LYMain.c:3241
-#, fuzzy
-msgid "the University of Kansas, CERN, and other contributors."
-msgstr "ku i Bya Na Ikindi Abaterankunga"
-
-#: src/LYMain.c:3242
-#, fuzzy
-msgid "Distributed under the GNU General Public License (Version 2)."
-msgstr "i"
-
-#: src/LYMain.c:3243
-#, fuzzy
-msgid "See http://lynx.isc.org/ and the online help for more information."
-msgstr "Mucukumbuzi."
-
-#: src/LYMain.c:4060
-#, fuzzy, c-format
-msgid "USAGE: %s [options] [file]\n"
-msgstr "Amahitamo IDOSIYE\n"
-
-#: src/LYMain.c:4061
-#, c-format
-msgid "Options are:\n"
-msgstr ""
-
-#: src/LYMain.c:4360
-#, c-format
-msgid "%s: Invalid Option: %s\n"
-msgstr ""
-
-#: src/LYMainLoop.c:594
-#, fuzzy, c-format
-msgid "Internal error: Invalid mouse link %d!"
-msgstr "Ikosa Imbeba Ihuza"
-
-#: src/LYMainLoop.c:714 src/LYMainLoop.c:5096
-#, fuzzy
-msgid "A URL specified by the user"
-msgstr "A ku i Ukoresha:"
-
-#: src/LYMainLoop.c:1173
-#, fuzzy
-msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
-msgstr "Ifishi Ibyatanzwe OYA Tanga"
-
-#.
-#. * Make a name for this help file.
-#.
-#: src/LYMainLoop.c:3105
-msgid "Help Screen"
-msgstr ""
-
-#: src/LYMainLoop.c:3226
-msgid "System Index"
-msgstr ""
-
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
-#, fuzzy
-msgid "Entry into main screen"
-msgstr "Mugaragaza"
-
-#: src/LYMainLoop.c:3843
-#, fuzzy
-msgid "No next document present"
-msgstr "Komeza>> Inyandiko"
-
-#: src/LYMainLoop.c:4139
-#, fuzzy
-msgid "charset for this document specified explicitly, sorry..."
-msgstr "kugirango iyi Inyandiko"
-
-#: src/LYMainLoop.c:5052
-#, fuzzy
-msgid "cd to:"
-msgstr "Kuri"
-
-#: src/LYMainLoop.c:5077
-#, fuzzy
-msgid "A component of path is not a directory"
-msgstr "A Bya Inzira ni OYA a bushyinguro"
-
-#: src/LYMainLoop.c:5080
-#, fuzzy
-msgid "failed to change directory"
-msgstr "Byanze Kuri Guhindura>> bushyinguro"
-
-#: src/LYMainLoop.c:6256
-#, fuzzy
-msgid "Reparsing document under current settings..."
-msgstr "Inyandiko KIGEZWEHO Amagenamiterere"
-
-#: src/LYMainLoop.c:6547
-#, fuzzy, c-format
-msgid "Fatal error - could not open output file %s\n"
-msgstr "Ikosa OYA Gufungura Ibisohoka IDOSIYE\n"
-
-#: src/LYMainLoop.c:6884
-msgid "TABLE center enable."
-msgstr ""
-
-#: src/LYMainLoop.c:6887
-msgid "TABLE center disable."
-msgstr ""
-
-#: src/LYMainLoop.c:6964
-#, fuzzy
-msgid "Current URL is empty."
-msgstr "bushyinguro"
-
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
-msgid "Copy to clipboard failed."
-msgstr ""
-
-#: src/LYMainLoop.c:6968
-msgid "Document URL put to clipboard."
-msgstr ""
-
-#: src/LYMainLoop.c:6970
-msgid "Link URL put to clipboard."
-msgstr ""
-
-#: src/LYMainLoop.c:6997
-msgid "No URL in the clipboard."
-msgstr ""
-
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
-#, fuzzy
-msgid "-index-"
-msgstr "-Umubarendanga"
-
-#: src/LYMainLoop.c:7778
-msgid "lynx: Can't access startfile"
-msgstr ""
-
-#: src/LYMainLoop.c:7790
-#, fuzzy
-msgid "lynx: Start file could not be found or is not text/html or text/plain"
-msgstr "Gutangira IDOSIYE OYA Byabonetse Cyangwa ni OYA Umwandiko HTML Cyangwa Umwandiko Byuzuye"
-
-#: src/LYMainLoop.c:7791
-msgid "      Exiting..."
-msgstr ""
-
-#: src/LYMainLoop.c:7832
-#, fuzzy
-msgid "-more-"
-msgstr "-Birenzeho"
-
-#. Enable scrolling.
-#: src/LYNews.c:183
-#, fuzzy
-msgid "You will be posting to:"
-msgstr "Kuri"
-
-#.
-#. * Get the mail address for the From header, offering personal_mail_address
-#. * as default.
-#.
-#: src/LYNews.c:192
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-" Please provide your mail address for the From: header\n"
-msgstr ""
-"\n"
-"Ubutumwa Aderesi kugirango i\n"
-
-#.
-#. * Get the Subject header, offering the current document's title as the
-#. * default if this is a followup rather than a new post.  - FM
-#.
-#: src/LYNews.c:209
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-" Please provide or edit the Subject: header\n"
-msgstr ""
-"\n"
-"Cyangwa Guhindura i\n"
-
-#: src/LYNews.c:299
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-" Please provide or edit the Organization: header\n"
-msgstr ""
-"\n"
-"Cyangwa Guhindura i\n"
-
-#.
-#. * Use the built in line editior.
-#.
-#: src/LYNews.c:356
-#, fuzzy
-msgid ""
-"\n"
-"\n"
-" Please enter your message below."
-msgstr ""
-"\n"
-"\n"
-"Injiza Ubutumwa munsi"
-
-#: src/LYNews.c:402
-#, fuzzy
-msgid "Message has no original text!"
-msgstr "Oya Umwimerere Umwandiko"
-
-#: src/LYOptions.c:765
-#, fuzzy
-msgid "review/edit B)ookmarks files"
-msgstr "Isubiramo Guhindura Idosiye"
-
-#: src/LYOptions.c:767
-#, fuzzy
-msgid "B)ookmark file: "
-msgstr "IDOSIYE"
-
-#: src/LYOptions.c:2127 src/LYOptions.c:2134
-msgid "ON"
-msgstr ""
-
-#. verbose_img variable
-#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2285 src/LYOptions.c:2296
-msgid "OFF"
-msgstr ""
-
-#: src/LYOptions.c:2129
-msgid "NEVER"
-msgstr ""
-
-#: src/LYOptions.c:2130
-msgid "ALWAYS"
-msgstr ""
-
-#: src/LYOptions.c:2146 src/LYOptions.c:2277
-msgid "ignore"
-msgstr ""
-
-#: src/LYOptions.c:2147
-msgid "ask user"
-msgstr ""
-
-#: src/LYOptions.c:2148
-msgid "accept all"
-msgstr ""
-
-#: src/LYOptions.c:2160
-msgid "ALWAYS OFF"
-msgstr ""
-
-#: src/LYOptions.c:2161
-msgid "FOR LOCAL FILES ONLY"
-msgstr ""
-
-#: src/LYOptions.c:2163
-msgid "ALWAYS ON"
-msgstr ""
-
-#: src/LYOptions.c:2175
-msgid "Numbers act as arrows"
-msgstr ""
-
-#: src/LYOptions.c:2177
-msgid "Links are numbered"
-msgstr ""
-
-#: src/LYOptions.c:2180
-msgid "Links and form fields are numbered"
-msgstr ""
-
-#: src/LYOptions.c:2183
-msgid "Form fields are numbered"
-msgstr ""
-
-#: src/LYOptions.c:2197
-msgid "Case insensitive"
-msgstr ""
-
-#: src/LYOptions.c:2198
-msgid "Case sensitive"
-msgstr ""
-
-#: src/LYOptions.c:2222
-msgid "prompt normally"
-msgstr ""
-
-#: src/LYOptions.c:2223
-msgid "force yes-response"
-msgstr ""
-
-#: src/LYOptions.c:2224
-msgid "force no-response"
-msgstr ""
-
-#: src/LYOptions.c:2242
-#, fuzzy
-msgid "Novice"
-msgstr "Ntacyo"
-
-#: src/LYOptions.c:2243
-#, fuzzy
-msgid "Intermediate"
-msgstr "By'imbere"
-
-#: src/LYOptions.c:2244
-msgid "Advanced"
-msgstr ""
-
-#: src/LYOptions.c:2253
-msgid "By First Visit"
-msgstr ""
-
-#: src/LYOptions.c:2255
-msgid "By First Visit Reversed"
-msgstr ""
-
-#: src/LYOptions.c:2256
-msgid "As Visit Tree"
-msgstr ""
-
-#: src/LYOptions.c:2257
-msgid "By Last Visit"
-msgstr ""
-
-#: src/LYOptions.c:2259
-msgid "By Last Visit Reversed"
-msgstr ""
-
-#. Old_DTD variable
-#: src/LYOptions.c:2270
-msgid "relaxed (TagSoup mode)"
-msgstr ""
-
-#: src/LYOptions.c:2271
-msgid "strict (SortaSGML mode)"
-msgstr ""
-
-#: src/LYOptions.c:2278
-msgid "as labels"
-msgstr ""
-
-#: src/LYOptions.c:2279
-#, fuzzy
-msgid "as links"
-msgstr "iyi Ihuza"
-
-#: src/LYOptions.c:2286
-#, fuzzy
-msgid "show filename"
-msgstr "(IDOSIYE Izina:"
-
-#: src/LYOptions.c:2297
-msgid "STANDARD"
-msgstr ""
-
-#: src/LYOptions.c:2298
-msgid "ADVANCED"
-msgstr ""
-
-# svx/source\gallery2\gallery.src:RID_SVXDLG_GALLERY_CBX.text
-#: src/LYOptions.c:2329
-#, fuzzy
-msgid "Directories first"
-msgstr "Ububiko bwungirije"
-
-#: src/LYOptions.c:2330
-#, fuzzy
-msgid "Files first"
-msgstr "Itangira"
-
-#: src/LYOptions.c:2331
-#, fuzzy
-msgid "Mixed style"
-msgstr "Guhindura IMISUSIRE"
-
-#: src/LYOptions.c:2339 src/LYOptions.c:2359
-#, fuzzy
-msgid "By Name"
-msgstr "Izina:"
-
-#: src/LYOptions.c:2340 src/LYOptions.c:2360
-msgid "By Type"
-msgstr ""
-
-#: src/LYOptions.c:2341 src/LYOptions.c:2361
-msgid "By Size"
-msgstr ""
-
-#: src/LYOptions.c:2342 src/LYOptions.c:2362
-#, fuzzy
-msgid "By Date"
-msgstr "Itariki:"
-
-#: src/LYOptions.c:2343
-msgid "By Mode"
-msgstr ""
-
-#: src/LYOptions.c:2345
-msgid "By User"
-msgstr ""
-
-#: src/LYOptions.c:2346
-#, fuzzy
-msgid "By Group"
-msgstr "Itsinda"
-
-#: src/LYOptions.c:2371
-msgid "Do not show rate"
-msgstr ""
-
-#: src/LYOptions.c:2372 src/LYOptions.c:2373
-#, fuzzy, c-format
-msgid "Show %s/sec rate"
-msgstr "Igipimo"
-
-#: src/LYOptions.c:2375 src/LYOptions.c:2376
-#, c-format
-msgid "Show %s/sec, ETA"
-msgstr ""
-
-#: src/LYOptions.c:2379
-#, fuzzy
-msgid "Show progressbar"
-msgstr "Agafashsagenda"
-
-#: src/LYOptions.c:2391
-msgid "Accept lynx's internal types"
-msgstr ""
-
-#: src/LYOptions.c:2392
-msgid "Also accept lynx.cfg's types"
-msgstr ""
-
-#: src/LYOptions.c:2393
-msgid "Also accept user's types"
-msgstr ""
-
-#: src/LYOptions.c:2394
-msgid "Also accept system's types"
-msgstr ""
-
-#: src/LYOptions.c:2395
-#, fuzzy
-msgid "Accept all types"
-msgstr "emera ibihindutse/ibyahindutse"
-
-#: src/LYOptions.c:2404
-msgid "gzip"
-msgstr ""
-
-#: src/LYOptions.c:2405
-msgid "deflate"
-msgstr ""
-
-#: src/LYOptions.c:2408
-msgid "compress"
-msgstr ""
-
-#: src/LYOptions.c:2411
-msgid "bzip2"
-msgstr ""
-
-#: src/LYOptions.c:2413
-msgid "All"
-msgstr ""
-
-#: src/LYOptions.c:2681 src/LYOptions.c:2705
-#, fuzzy, c-format
-msgid "Use %s to invoke the Options menu!"
-msgstr "Kuri i Ibikubiyemo"
-
-#: src/LYOptions.c:3477
-#, fuzzy
-msgid "(options marked with (!) will not be saved)"
-msgstr "(Amahitamo cy/ byagarajwe Na: OYA"
-
-#: src/LYOptions.c:3485
-msgid "General Preferences"
-msgstr ""
-
-#. ***************************************************************
-#. User Mode: SELECT
-#: src/LYOptions.c:3489
-#, fuzzy
-msgid "User mode"
-msgstr "Ubwoko"
-
-#. Editor: INPUT
-#: src/LYOptions.c:3495
-msgid "Editor"
-msgstr "umwanditsi"
-
-#. Search Type: SELECT
-#: src/LYOptions.c:3500
-#, fuzzy
-msgid "Type of Search"
-msgstr "Bya"
-
-#: src/LYOptions.c:3505
-msgid "Security and Privacy"
-msgstr ""
-
-#. ***************************************************************
-#. Cookies: SELECT
-#: src/LYOptions.c:3509
-msgid "Cookies"
-msgstr "Cookie"
-
-#. Cookie Prompting: SELECT
-#: src/LYOptions.c:3523
-msgid "Invalid-Cookie Prompting"
-msgstr ""
-
-#. SSL Prompting: SELECT
-#: src/LYOptions.c:3530
-msgid "SSL Prompting"
-msgstr ""
-
-#: src/LYOptions.c:3536
-msgid "Keyboard Input"
-msgstr ""
-
-#. ***************************************************************
-#. Keypad Mode: SELECT
-#: src/LYOptions.c:3540
-#, fuzzy
-msgid "Keypad mode"
-msgstr "Ubwoko"
-
-#. Emacs keys: ON/OFF
-#: src/LYOptions.c:3546
-#, fuzzy
-msgid "Emacs keys"
-msgstr "Utubuto"
-
-#. VI Keys: ON/OFF
-#: src/LYOptions.c:3552
-#, fuzzy
-msgid "VI keys"
-msgstr "Utubuto"
-
-#. Line edit style: SELECT
-#. well, at least 2 line edit styles available
-#: src/LYOptions.c:3559
-#, fuzzy
-msgid "Line edit style"
-msgstr "Guhindura IMISUSIRE"
-
-#. Keyboard layout: SELECT
-#: src/LYOptions.c:3571
-#, fuzzy
-msgid "Keyboard layout"
-msgstr "Imigaragarire"
-
-#.
-#. * Display and Character Set
-#.
-#: src/LYOptions.c:3585
-#, fuzzy
-msgid "Display and Character Set"
-msgstr "Na"
-
-#. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3590
-#, fuzzy
-msgid "Use locale-based character set"
-msgstr "Inyandiko Inyuguti Gushyiraho"
-
-#. Display Character Set: SELECT
-#: src/LYOptions.c:3599
-#, fuzzy
-msgid "Display character set"
-msgstr "Inyuguti Gushyiraho"
-
-#: src/LYOptions.c:3630
-#, fuzzy
-msgid "Assumed document character set"
-msgstr "Inyandiko Inyuguti Gushyiraho"
-
-#.
-#. * Since CJK people hardly mixed with other world
-#. * we split the header to make it more readable:
-#. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
-#.
-#: src/LYOptions.c:3650
-#, fuzzy
-msgid "CJK mode"
-msgstr "Ubwoko"
-
-#: src/LYOptions.c:3652
-#, fuzzy
-msgid "Raw 8-bit"
-msgstr "8"
-
-#. X Display: INPUT
-#: src/LYOptions.c:3660
-msgid "X Display"
-msgstr ""
-
-#.
-#. * Document Appearance
-#.
-#: src/LYOptions.c:3666
-msgid "Document Appearance"
-msgstr ""
-
-#: src/LYOptions.c:3672
-#, fuzzy
-msgid "Show color"
-msgstr "Ibara"
-
-#. Show cursor: ON/OFF
-#: src/LYOptions.c:3696
-#, fuzzy
-msgid "Show cursor"
-msgstr "indanga"
-
-#. Underline links: ON/OFF
-#: src/LYOptions.c:3702
-#, fuzzy
-msgid "Underline links"
-msgstr "amahuza"
-
-#. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3709
-#, fuzzy
-msgid "Show scrollbar"
-msgstr "Agafashsagenda"
-
-#. Select Popups: ON/OFF
-#: src/LYOptions.c:3716
-#, fuzzy
-msgid "Popups for select fields"
-msgstr "kugirango Guhitamo Imyanya"
-
-#. HTML error recovery: SELECT
-#: src/LYOptions.c:3722
-#, fuzzy
-msgid "HTML error recovery"
-msgstr "Ikosa"
-
-#. Show Images: SELECT
-#: src/LYOptions.c:3728
-#, fuzzy
-msgid "Show images"
-msgstr "Ishusho"
-
-#. Verbose Images: ON/OFF
-#: src/LYOptions.c:3742
-#, fuzzy
-msgid "Verbose images"
-msgstr "Ishusho"
-
-#.
-#. * Headers Transferred to Remote Servers
-#.
-#: src/LYOptions.c:3750
-#, fuzzy
-msgid "Headers Transferred to Remote Servers"
-msgstr "Kuri"
-
-#. ***************************************************************
-#. Mail Address: INPUT
-#: src/LYOptions.c:3754
-#, fuzzy
-msgid "Personal mail address"
-msgstr "Ubutumwa Aderesi"
-
-#: src/LYOptions.c:3760
-#, fuzzy
-msgid "Password for anonymous ftp"
-msgstr "kugirango Amakuru Ubuturo"
-
-#. Preferred media type: SELECT
-#: src/LYOptions.c:3766
-#, fuzzy
-msgid "Preferred media type"
-msgstr "Bayite"
-
-#. Preferred encoding: SELECT
-#: src/LYOptions.c:3772
-#, fuzzy
-msgid "Preferred encoding"
-msgstr "Inyandiko Ururimi"
-
-#. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3778
-#, fuzzy
-msgid "Preferred document character set"
-msgstr "Inyandiko Inyuguti Gushyiraho"
-
-#. Preferred Document Language: INPUT
-#: src/LYOptions.c:3783
-#, fuzzy
-msgid "Preferred document language"
-msgstr "Inyandiko Ururimi"
-
-#: src/LYOptions.c:3789
-#, fuzzy
-msgid "User-Agent header"
-msgstr "Umutwempangano"
-
-#.
-#. * Listing and Accessing Files
-#.
-#: src/LYOptions.c:3797
-#, fuzzy
-msgid "Listing and Accessing Files"
-msgstr "Na"
-
-#. FTP sort: SELECT
-#: src/LYOptions.c:3802
-msgid "Use Passive FTP"
-msgstr ""
-
-#. FTP sort: SELECT
-#: src/LYOptions.c:3808
-#, fuzzy
-msgid "FTP sort criteria"
-msgstr "Ishungura Ibigenderwaho"
-
-#. Local Directory Sort: SELECT
-#: src/LYOptions.c:3816
-#, fuzzy
-msgid "Local directory sort criteria"
-msgstr "bushyinguro Ishungura Ibigenderwaho"
-
-#. Local Directory Order: SELECT
-#: src/LYOptions.c:3822
-#, fuzzy
-msgid "Local directory sort order"
-msgstr "bushyinguro Ishungura Itondekanya"
-
-#: src/LYOptions.c:3831
-#, fuzzy
-msgid "Show dot files"
-msgstr "Akadomo Idosiye"
-
-#: src/LYOptions.c:3839
-#, fuzzy
-msgid "Execution links"
-msgstr "amahuza"
-
-#. Show transfer rate: SELECT
-#: src/LYOptions.c:3859
-#, fuzzy
-msgid "Show transfer rate"
-msgstr "Igipimo"
-
-#.
-#. * Special Files and Screens
-#.
-#: src/LYOptions.c:3879
-#, fuzzy
-msgid "Special Files and Screens"
-msgstr "Na"
-
-#: src/LYOptions.c:3884
-#, fuzzy
-msgid "Multi-bookmarks"
-msgstr "Ibirango"
-
-#: src/LYOptions.c:3892
-#, fuzzy
-msgid "Review/edit Bookmarks files"
-msgstr "Guhindura Idosiye"
-
-#: src/LYOptions.c:3894
-#, fuzzy
-msgid "Goto multi-bookmark menu"
-msgstr "Akamenyetso Ibikubiyemo"
-
-#: src/LYOptions.c:3896
-#, fuzzy
-msgid "Bookmarks file"
-msgstr "IDOSIYE"
-
-#. Auto Session: ON/OFF
-#: src/LYOptions.c:3903
-msgid "Auto Session"
-msgstr ""
-
-#. Session File Menu: INPUT
-#: src/LYOptions.c:3909
-msgid "Session file"
-msgstr ""
-
-#. Visited Pages: SELECT
-#: src/LYOptions.c:3915
-msgid "Visited Pages"
-msgstr ""
-
-#: src/LYOptions.c:3920
-#, fuzzy
-msgid "View the file "
-msgstr "i IDOSIYE"
-
-#: src/LYPrint.c:937
-#, fuzzy, c-format
-msgid " Print job complete.\n"
-msgstr "Byuzuye\n"
-
-#: src/LYPrint.c:1262
-msgid "Document:"
-msgstr "Inyandiko:"
-
-# sw/source\ui\dialog\docstdlg.src:TP_DOC_STAT.FT_LINE.text
-#: src/LYPrint.c:1263
-#, fuzzy
-msgid "Number of lines:"
-msgstr "Inomero z'imirongo:"
-
-#: src/LYPrint.c:1264
-msgid "Number of pages:"
-msgstr "Umubare w'amapaji:"
-
-# filter/source\pdf\impdialog.src:RID_PDF_EXPORT_DLG.FL_PAGES.text
-#: src/LYPrint.c:1265
-#, fuzzy
-msgid "pages"
-msgstr "Amapaji"
-
-# basctl/source\basicide\basidesh.src:RID_STR_PAGE.text
-#: src/LYPrint.c:1265
-#, fuzzy
-msgid "page"
-msgstr "Ipaji"
-
-#: src/LYPrint.c:1266
-msgid "(approximately)"
-msgstr ""
-
-#: src/LYPrint.c:1273
-#, fuzzy
-msgid "Some print functions have been disabled!"
-msgstr "Gucapa Imimaro Yahagaritswe"
-
-#: src/LYPrint.c:1277
-#, fuzzy
-msgid "Standard print options:"
-msgstr "Gucapa Amahitamo"
-
-# sc/source\ui\src\scstring.src:SCSTR_CFG_PRINT.text
-#: src/LYPrint.c:1278
-#, fuzzy
-msgid "Print options:"
-msgstr "Amahitamo yo gucapa"
-
-#: src/LYPrint.c:1285
-#, fuzzy
-msgid "Save to a local file"
-msgstr "Kubika Kuri a IDOSIYE"
-
-#: src/LYPrint.c:1287
-#, fuzzy
-msgid "Save to disk disabled"
-msgstr "Kubika Kuri Yahagaritswe"
-
-#: src/LYPrint.c:1294
-#, fuzzy
-msgid "Mail the file"
-msgstr "i IDOSIYE"
-
-#: src/LYPrint.c:1301
-#, fuzzy
-msgid "Print to the screen"
-msgstr "Kuri i Mugaragaza"
-
-#: src/LYPrint.c:1306
-#, fuzzy
-msgid "Print out on a printer attached to your vt100 terminal"
-msgstr "Inyuma ku a Mucapyi Kuri"
-
-#: src/LYReadCFG.c:371
-#, fuzzy, c-format
-msgid ""
-"Syntax Error parsing COLOR in configuration file:\n"
-"The line must be of the form:\n"
-"COLOR:INTEGER:FOREGROUND:BACKGROUND\n"
-"\n"
-"Here FOREGROUND and BACKGROUND must be one of:\n"
-"The special strings 'nocolor' or 'default', or\n"
-msgstr "in Iboneza IDOSIYE Umurongo Bya i Ifishi Na Bya Bidasanzwe Ikurikiranyanyuguti Cyangwa\n"
-
-#: src/LYReadCFG.c:384
-#, fuzzy
-msgid "Offending line:"
-msgstr "Umurongo"
-
-#: src/LYReadCFG.c:681
-#, fuzzy, c-format
-msgid "key remapping of %s to %s for %s failed\n"
-msgstr "Urufunguzo Bya Kuri kugirango\n"
-
-#: src/LYReadCFG.c:688
-#, fuzzy, c-format
-msgid "key remapping of %s to %s failed\n"
-msgstr "Urufunguzo Bya Kuri\n"
-
-#: src/LYReadCFG.c:709
-#, fuzzy, c-format
-msgid "invalid line-editor selection %s for key %s, selecting all\n"
-msgstr "Sibyo Umurongo Muhinduzi Ihitamo kugirango Urufunguzo\n"
-
-#: src/LYReadCFG.c:734 src/LYReadCFG.c:746
-#, fuzzy, c-format
-msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
-msgstr "Igenamiterere Bya Umurongo Muhinduzi Bifatanya kugirango Urufunguzo Kuri kugirango\n"
-
-#: src/LYReadCFG.c:750
-#, fuzzy, c-format
-msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
-msgstr "Igenamiterere Bya Umurongo Muhinduzi Bifatanya kugirango Urufunguzo kugirango\n"
-
-#: src/LYReadCFG.c:846
-#, fuzzy, c-format
-msgid "Lynx: cannot start, CERN rules file %s is not available\n"
-msgstr "Gutangira IDOSIYE ni OYA\n"
-
-#: src/LYReadCFG.c:847
-#, fuzzy
-msgid "(no name)"
-msgstr "(Oya Izina:"
-
-#: src/LYReadCFG.c:1880
-#, c-format
-msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
-msgstr ""
-
-#: src/LYReadCFG.c:1882
-#, fuzzy, c-format
-msgid "Last attempted include was '%s',\n"
-msgstr "Gushyiramo\n"
-
-#: src/LYReadCFG.c:1883
-#, fuzzy, c-format
-msgid "included from '%s'.\n"
-msgstr "Bivuye\n"
-
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
-#, fuzzy
-msgid "The following is read from your lynx.cfg file."
-msgstr "ni Gusoma Bivuye IDOSIYE"
-
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
-#, fuzzy
-msgid "Please read the distribution"
-msgstr "Gusoma i Ikwirakwiza..."
-
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
-#, fuzzy
-msgid "for more comments."
-msgstr "kugirango Birenzeho Ibisobanuro"
-
-#: src/LYReadCFG.c:2344
-msgid "RELOAD THE CHANGES"
-msgstr ""
-
-#: src/LYReadCFG.c:2352
-#, fuzzy
-msgid "Your primary configuration"
-msgstr "Iboneza"
-
-#: src/LYShowInfo.c:173
-msgid "Directory that you are currently viewing"
-msgstr ""
-
-#: src/LYShowInfo.c:176
-msgid "Name:"
-msgstr "Izina:"
-
-#: src/LYShowInfo.c:179
-msgid "URL:"
-msgstr "URL:"
-
-#: src/LYShowInfo.c:193
-#, fuzzy
-msgid "Directory that you have currently selected"
-msgstr "Byahiswemo"
-
-#: src/LYShowInfo.c:195
-#, fuzzy
-msgid "File that you have currently selected"
-msgstr "Idosiye Byahiswemo"
-
-#: src/LYShowInfo.c:198
-#, fuzzy
-msgid "Symbolic link that you have currently selected"
-msgstr "Ihuza Byahiswemo"
-
-#: src/LYShowInfo.c:201
-#, fuzzy
-msgid "Item that you have currently selected"
-msgstr "Byahiswemo"
-
-#: src/LYShowInfo.c:203
-#, fuzzy
-msgid "Full name:"
-msgstr "Izina:"
-
-#: src/LYShowInfo.c:212
-#, fuzzy
-msgid "Unable to follow link"
-msgstr "Kuri Ihuza"
-
-#: src/LYShowInfo.c:214
-#, fuzzy
-msgid "Points to file:"
-msgstr "Kuri IDOSIYE"
-
-#: src/LYShowInfo.c:219
-#, fuzzy
-msgid "Name of owner:"
-msgstr "Bya"
-
-#: src/LYShowInfo.c:222
-#, fuzzy
-msgid "Group name:"
-msgstr "Izina ry'Itsinda:"
-
-# 2257
-#: src/LYShowInfo.c:224
-#, fuzzy
-msgid "File size:"
-msgstr "ubunini/ ingano ya dosiye"
-
-# sfx2/source\appl\sfx.src:STR_BYTES.text
-#: src/LYShowInfo.c:226
-#, fuzzy
-msgid "(bytes)"
-msgstr "Bayite"
-
-# setup2/source\ui\app.src:FT_INSTINFO_MKDIR.text
-#.
-#. * Include date and time information.
-#.
-#: src/LYShowInfo.c:231
-#, fuzzy
-msgid "Creation date:"
-msgstr "Irema ry'itariki"
-
-# setup2/source\ui\dialog\dialog.src:RESID_DLG_OVERWRITE.10.text
-#: src/LYShowInfo.c:234
-#, fuzzy
-msgid "Last modified:"
-msgstr "yahinduwe bwa nyuma"
-
-#: src/LYShowInfo.c:237
-#, fuzzy
-msgid "Last accessed:"
-msgstr "birabonetse"
-
-#: src/LYShowInfo.c:243
-msgid "Access Permissions"
-msgstr ""
-
-#: src/LYShowInfo.c:278
-#, fuzzy
-msgid "Group:"
-msgstr "Itsinda"
-
-#: src/LYShowInfo.c:298
-msgid "World:"
-msgstr ""
-
-#: src/LYShowInfo.c:305
-#, fuzzy
-msgid "File that you are currently viewing"
-msgstr "Idosiye"
-
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
-msgid "Linkname:"
-msgstr ""
-
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
-msgid "Charset:"
-msgstr ""
-
-#: src/LYShowInfo.c:333
-msgid "(assumed)"
-msgstr ""
-
-#: src/LYShowInfo.c:340
-msgid "Server:"
-msgstr "Seriveri"
-
-#: src/LYShowInfo.c:343
-msgid "Date:"
-msgstr "Itariki:"
-
-#: src/LYShowInfo.c:346
-msgid "Last Mod:"
-msgstr ""
-
-#: src/LYShowInfo.c:351
-msgid "Expires:"
-msgstr ""
-
-#: src/LYShowInfo.c:354
-msgid "Cache-Control:"
-msgstr ""
-
-#: src/LYShowInfo.c:357
-msgid "Content-Length:"
-msgstr ""
-
-#: src/LYShowInfo.c:361
-msgid "Length:"
-msgstr ""
-
-#: src/LYShowInfo.c:366
-msgid "Language:"
-msgstr "Ururimi:"
-
-#: src/LYShowInfo.c:373
-msgid "Post Data:"
-msgstr ""
-
-#: src/LYShowInfo.c:376
-msgid "Post Content Type:"
-msgstr ""
-
-#: src/LYShowInfo.c:379
-#, fuzzy
-msgid "Owner(s):"
-msgstr "S"
-
-# sfx2/source\dialog\dinfdlg.src:TP_DOCINFODOC.FT_FILE_SIZE.text
-#: src/LYShowInfo.c:384
-#, fuzzy
-msgid "size:"
-msgstr "Ingano"
-
-#: src/LYShowInfo.c:386
-msgid "lines"
-msgstr "Imirongo"
-
-#: src/LYShowInfo.c:390
-#, fuzzy
-msgid "forms mode"
-msgstr "Amafishi Ubwoko"
-
-#: src/LYShowInfo.c:392
-#, fuzzy
-msgid "source"
-msgstr "Inkomoko"
-
-#: src/LYShowInfo.c:393
-msgid "normal"
-msgstr "bisanzwe"
-
-#: src/LYShowInfo.c:395
-msgid ", safe"
-msgstr ""
-
-#: src/LYShowInfo.c:397
-#, fuzzy
-msgid ", via internal link"
-msgstr ",Biturutse By'imbere Ihuza"
-
-#: src/LYShowInfo.c:402
-#, fuzzy
-msgid ", no-cache"
-msgstr ",Oya Ubwihisho"
-
-#: src/LYShowInfo.c:404
-#, fuzzy
-msgid ", ISMAP script"
-msgstr ",IYANDIKA"
-
-#: src/LYShowInfo.c:406
-#, fuzzy
-msgid ", bookmark file"
-msgstr ",Akamenyetso IDOSIYE"
-
-# #-#-#-#-#  goodies.pot (PACKAGE VERSION)  #-#-#-#-#
-# goodies/source\filter.vcl\egif\dlgegif.src:DLG_EXPORT_GIF.GRP_MODE.text
-# #-#-#-#-#  goodies.pot (PACKAGE VERSION)  #-#-#-#-#
-# goodies/source\filter.vcl\eos2met\dlgeos2.src:DLG_EXPORT_EMET.GRP_MODE.text
-# #-#-#-#-#  goodies.pot (PACKAGE VERSION)  #-#-#-#-#
-# goodies/source\filter.vcl\epict\dlgepct.src:DLG_EXPORT_EPCT.GRP_MODE.text
-# #-#-#-#-#  goodies.pot (PACKAGE VERSION)  #-#-#-#-#
-# goodies/source\filter.vcl\epng\dlgepng.src:DLG_EXPORT_EPNG.GRP_COMPRESSION.text
-#: src/LYShowInfo.c:410
-#, fuzzy
-msgid "mode:"
-msgstr "Ubwoko"
-
-#: src/LYShowInfo.c:416
-#, fuzzy
-msgid "Link that you currently have selected"
-msgstr "Byahiswemo"
-
-#: src/LYShowInfo.c:425
-#, fuzzy
-msgid "Method:"
-msgstr "Uburyo:"
-
-#: src/LYShowInfo.c:429
-msgid "Enctype:"
-msgstr ""
-
-#: src/LYShowInfo.c:435
-#, fuzzy
-msgid "Action:"
-msgstr "Ahari:"
-
-#: src/LYShowInfo.c:440
-#, fuzzy
-msgid "(Form field)"
-msgstr "(Umwanya"
-
-#: src/LYShowInfo.c:449
-#, fuzzy
-msgid "No Links on the current page"
-msgstr "ku i KIGEZWEHO Ipaji"
-
-#: src/LYShowInfo.c:454
-#, fuzzy
-msgid "Server Headers:"
-msgstr "Seriveri"
-
-#: src/LYStyle.c:312
-#, fuzzy, c-format
-msgid ""
-"Syntax Error parsing style in lss file:\n"
-"[%s]\n"
-"The line must be of the form:\n"
-"OBJECT:MONO:COLOR (ie em:bold:brightblue:white)\n"
-"where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n"
-"\n"
-msgstr "IMISUSIRE in IDOSIYE Umurongo Bya i Ifishi UTSINDAGIYE Umweru ni Bya U\n"
-
-#: src/LYTraversal.c:108
-#, fuzzy
-msgid "here is a list of the history stack so that you may rebuild"
-msgstr "ni a Urutonde Bya i Urutonde Gicurasi Kubaka bushya"
-
-#: src/LYUpload.c:75
-#, fuzzy
-msgid "ERROR! - upload command is misconfigured"
-msgstr "Komandi: ni"
-
-#: src/LYUpload.c:96
-msgid "Illegal redirection \"../\" found! Request ignored."
-msgstr ""
-
-#: src/LYUpload.c:99
-#, fuzzy
-msgid "Illegal character \"/\" found! Request ignored."
-msgstr "Inyuguti Byabonetse"
-
-#: src/LYUpload.c:102
-#, fuzzy
-msgid "Illegal redirection using \"~\" found! Request ignored."
-msgstr "ikoresha Byabonetse"
-
-#: src/LYUpload.c:159
-#, fuzzy
-msgid "Unable to upload file."
-msgstr "Kuri IDOSIYE"
-
-#: src/LYUpload.c:201
-msgid "Upload To:"
-msgstr ""
-
-#: src/LYUpload.c:202
-#, fuzzy
-msgid "Upload options:"
-msgstr "Amahitamo"
-
-#: src/LYUtils.c:1819
-msgid "Download document URL put to clipboard."
-msgstr ""
-
-#: src/LYUtils.c:2604
-#, fuzzy
-msgid "Unexpected access protocol for this URL scheme."
-msgstr "Porotokole kugirango iyi Igishusho"
-
-#: src/LYUtils.c:3408
-msgid "Too many tempfiles"
-msgstr ""
-
-#: src/LYUtils.c:3708
-#, fuzzy
-msgid "unknown restriction"
-msgstr "Kitazwi"
-
-#: src/LYUtils.c:3739
-#, fuzzy, c-format
-msgid "No restrictions set.\n"
-msgstr "Amabwiriza Gushyiraho\n"
-
-#: src/LYUtils.c:3742
-#, fuzzy, c-format
-msgid "Restrictions set:\n"
-msgstr "Gushyiraho\n"
-
-#: src/LYUtils.c:5120
-#, fuzzy
-msgid "Cannot find HOME directory"
-msgstr "Gushaka bushyinguro"
-
-#: src/LYrcFile.c:16
-#, fuzzy
-msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
-msgstr "Yahagaritswe in\n"
-
-#: src/LYrcFile.c:317
-#, fuzzy
-msgid ""
-"accept_all_cookies allows the user to tell Lynx to automatically\n"
-"accept all cookies if desired.  The default is \"FALSE\" which will\n"
-"prompt for each cookie.  Set accept_all_cookies to \"TRUE\" to accept\n"
-"all cookies.\n"
-msgstr "i Ukoresha: Kuri Kuri Byose Inyandikonyakwirema NIBA Mburabuzi ni kugirango Kuri Kuri Inyandikonyakwirema\n"
-
-#: src/LYrcFile.c:325
-msgid ""
-"anonftp_password allows the user to tell Lynx to use the personal\n"
-"email address as the password for anonymous ftp.  If no value is given,\n"
-"Lynx will use the personal email address.  Set anonftp_password\n"
-"to a different value if you choose.\n"
-msgstr ""
-
-#: src/LYrcFile.c:332
-#, fuzzy
-msgid ""
-"bookmark_file specifies the name and location of the default bookmark\n"
-"file into which the user can paste links for easy access at a later\n"
-"date.\n"
-msgstr "i Izina: Na Ahantu Bya i Mburabuzi i Ukoresha: Komeka amahuza kugirango ku a\n"
-
-#: src/LYrcFile.c:337
-#, fuzzy
-msgid ""
-"If case_sensitive_searching is \"on\" then when the user invokes a search\n"
-"using the 's' or '/' keys, the search performed will be case sensitive\n"
-"instead of case INsensitive.  The default is usually \"off\".\n"
-msgstr "ni ku Hanyuma Ryari: i Ukoresha: a i Cyangwa Utubuto i Gushaka Bya Mburabuzi ni Bidakora\n"
-
-#: src/LYrcFile.c:342
-#, fuzzy
-msgid ""
-"The character_set definition controls the representation of 8 bit\n"
-"characters for your terminal.  If 8 bit characters do not show up\n"
-"correctly on your screen you may try changing to a different 8 bit\n"
-"set or using the 7 bit character approximations.\n"
-"Current valid characters sets are:\n"
-msgstr ""
-"Insobanuro Amagenzura i Bya 8 kugirango 8 Inyuguti OYA Garagaza ku Mugaragaza Gicurasi Kuri a 8 Cyangwa ikoresha i 7 Inyuguti "
-"Byemewe Inyuguti\n"
-
-#: src/LYrcFile.c:349
-#, fuzzy
-msgid ""
-"cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
-"lists of domains from which Lynx should automatically accept or reject\n"
-"all cookies.  If a domain is specified in both options, rejection will\n"
-"take precedence.  The accept_all_cookies parameter will override any\n"
-"settings made here.\n"
-msgstr "Na Akitso Bya Bivuye ku buryo bwikora Kwemera Cyangwa Inyandikonyakwirema a Urwego ni in Byombi Amahitamo\n"
-
-#: src/LYrcFile.c:357
-#, fuzzy
-msgid ""
-"cookie_file specifies the file from which to read persistent cookies.\n"
-"The default is ~/"
-msgstr "i IDOSIYE Bivuye Kuri Gusoma Inyandikonyakwirema Mburabuzi ni"
-
-#: src/LYrcFile.c:362
-#, fuzzy
-msgid ""
-"cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
-"cookie_query_invalid_domains are comma-delimited lists of which domains\n"
-"should be subjected to varying degrees of validity checking.  If a\n"
-"domain is set to strict checking, strict conformance to RFC2109 will\n"
-"be applied.  A domain with loose checking will be allowed to set cookies\n"
-"with an invalid path or domain attribute.  All domains will default to\n"
-"querying the user for an invalid path or domain.\n"
-msgstr ""
-"Akitso Intonde Bya Kuri Dogere Bya Ukugira agaciro ni Gushyiraho Kuri Kuri Byashyizweho A Urwego Na: Biregarega Kuri Gushyiraho "
-"Sibyo Inzira Cyangwa Urwego Ikiranga Mburabuzi i Ukoresha: kugirango Sibyo Inzira Cyangwa Urwego\n"
-
-#: src/LYrcFile.c:376
-#, fuzzy
-msgid ""
-"dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
-"(if implemented).  The default is \"ORDER_BY_NAME\"\n"
-msgstr "i bushyinguro Urutonde Itondekanya NIBA Mburabuzi ni\n"
-
-#: src/LYrcFile.c:381
-#, fuzzy
-msgid ""
-"dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
-"(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
-"files and directories together.  \"FILES_FIRST\" lists files first and\n"
-"\"DIRECTORIES_FIRST\" lists directories first.\n"
-msgstr ""
-"i bushyinguro Urutonde IMISUSIRE NIBA Mburabuzi ni Na ububiko bw'amaderese Intonde Idosiye Itangira Intonde ububiko bw'amaderese "
-"Itangira\n"
-
-#: src/LYrcFile.c:389
-#, fuzzy
-msgid ""
-"If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
-"  ^N = down    ^P = up\n"
-"  ^B = left    ^F = right\n"
-"will be enabled.\n"
-msgstr "ni Kuri ku Hanyuma i Bisanzwe Igenda Utubuto Hasi Ibumoso: Bikora\n"
-
-#: src/LYrcFile.c:395
-#, fuzzy
-msgid ""
-"file_editor specifies the editor to be invoked when editing local files\n"
-"or sending mail.  If no editor is specified, then file editing is disabled\n"
-"unless it is activated from the command line, and the built-in line editor\n"
-"will be used for sending mail.\n"
-msgstr ""
-"i Muhinduzi Kuri Ryari: Ubutumwa Oya Muhinduzi ni Hanyuma IDOSIYE ni ni Bivuye i Komandi: Umurongo Na i in Umurongo kugirango "
-"Ubutumwa\n"
-
-#: src/LYrcFile.c:402
-#, fuzzy
-msgid ""
-"The file_sorting_method specifies which value to sort on when viewing\n"
-"file lists such as FTP directories.  The options are:\n"
-"   BY_FILENAME -- sorts on the name of the file\n"
-"   BY_TYPE     -- sorts on the type of the file\n"
-"   BY_SIZE     -- sorts on the size of the file\n"
-"   BY_DATE     -- sorts on the date of the file\n"
-msgstr ""
-"Agaciro Kuri Ishungura ku Ryari: Intonde Nka ububiko bw'amaderese Amahitamo ku i Izina: Bya i ku i Ubwoko Bya i ku i Ingano Bya i "
-"ku i Itariki Bya i\n"
-
-#: src/LYrcFile.c:424
-#, fuzzy
-msgid ""
-"lineedit_mode specifies the key binding used for inputting strings in\n"
-"prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
-"the following control characters are used for moving and deleting:\n"
-"\n"
-"             Prev  Next       Enter = Accept input\n"
-"   Move char: <-    ->        ^G    = Cancel input\n"
-"   Move word: ^P    ^N        ^U    = Erase line\n"
-" Delete char: ^H    ^R        ^A    = Beginning of line\n"
-" Delete word: ^B    ^F        ^E    = End of line\n"
-"\n"
-"Current lineedit modes are:\n"
-msgstr ""
-"i Urufunguzo Bifatanya kugirango Ikurikiranyanyuguti Na Amafishi ni Gushyiraho Kuri Igenzura Inyuguti kugirango Na INYUGUTI "
-"ijambo U INYUGUTI H A Bya ijambo E Impera Bya\n"
-
-#: src/LYrcFile.c:442
-#, fuzzy
-msgid ""
-"The following allow you to define sub-bookmark files and descriptions.\n"
-"The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
-"Up to 26 bookmark files (for the English capital letters) are allowed.\n"
-"We start with \"multi_bookmarkB\" since 'A' is the default (see above).\n"
-msgstr ""
-"Kwemerera Kuri Kugaragaza... Akamenyetso Idosiye Na Imiterere ni Izina ry'idosiye: Isobanuramiterere Kuri Akamenyetso Idosiye "
-"kugirango i Gutangira Na: guhera ni i Mburabuzi hejuru\n"
-
-#: src/LYrcFile.c:448
-#, fuzzy
-msgid ""
-"personal_mail_address specifies your personal mail address.  The\n"
-"address will be sent during HTTP file transfers for authorization and\n"
-"logging purposes, and for mailed comments.\n"
-"If you do not want this information given out, set the NO_FROM_HEADER\n"
-"to TRUE in lynx.cfg, or use the -nofrom command line switch.  You also\n"
-"could leave this field blank, but then you won't have it included in\n"
-"your mailed comments.\n"
-msgstr ""
-"Bwite Ubutumwa Aderesi Yoherejwe: IDOSIYE kugirango Impamvu Na kugirango Ibisobanuro OYA iyi Ibisobanuro Inyuma Gushyiraho i in "
-"Cyangwa Gukoresha i Komandi: Umurongo Hindura iyi Umwanya Ahatanditseho Hanyuma Ibisobanuro\n"
-
-#: src/LYrcFile.c:457
-#, fuzzy
-msgid ""
-"preferred_charset specifies the character set in MIME notation (e.g.,\n"
-"ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
-"to http servers using an Accept-Charset header.  The value should NOT\n"
-"include ISO-8859-1 or US-ASCII, since those values are always assumed\n"
-"by default.  May be a comma-separated list.\n"
-"If a file in that character set is available, the server will send it.\n"
-"If no Accept-Charset header is present, the default is that any\n"
-"character set is acceptable.  If an Accept-Charset header is present,\n"
-"and if the server cannot send a response which is acceptable\n"
-"according to the Accept-Charset header, then the server SHOULD send\n"
-"an error response, though the sending of an unacceptable response\n"
-"is also allowed.\n"
-msgstr "g.\n"
-
-#: src/LYrcFile.c:473
-#, fuzzy
-msgid ""
-"preferred_language specifies the language in MIME notation (e.g., en,\n"
-"fr, may be a comma-separated list in decreasing preference)\n"
-"which Lynx will indicate you prefer in requests to http servers.\n"
-"If a file in that language is available, the server will send it.\n"
-"Otherwise, the server will send the file in its default language.\n"
-msgstr "g.\n"
-
-#: src/LYrcFile.c:484
-#, fuzzy
-msgid ""
-"If run_all_execution_links is set \"on\" then all local execution links\n"
-"will be executed when they are selected.\n"
-"\n"
-"WARNING - This is potentially VERY dangerous.  Since you may view\n"
-"          information that is written by unknown and untrusted sources\n"
-"          there exists the possibility that Trojan horse links could be\n"
-"          written.  Trojan horse links could be written to erase files\n"
-"          or compromise security.  This should only be set to \"on\" if\n"
-"          you are viewing trusted source information.\n"
-msgstr ""
-"ni Gushyiraho ku Hanyuma Byose Ryari: Byahiswemo ni Gicurasi Ibisobanuro ni ku Kitazwi Na i amahuza amahuza Kuri Cyangwa "
-"Umutekano Gushyiraho Kuri ku Inkomoko Ibisobanuro\n"
-
-#: src/LYrcFile.c:495
-#, fuzzy
-msgid ""
-"If run_execution_links_on_local_files is set \"on\" then all local\n"
-"execution links that are found in LOCAL files will be executed when they\n"
-"are selected.  This is different from run_all_execution_links in that\n"
-"only files that reside on the local system will have execution link\n"
-"permissions.\n"
-"\n"
-"WARNING - This is potentially dangerous.  Since you may view\n"
-"          information that is written by unknown and untrusted sources\n"
-"          there exists the possibility that Trojan horse links could be\n"
-"          written.  Trojan horse links could be written to erase files\n"
-"          or compromise security.  This should only be set to \"on\" if\n"
-"          you are viewing trusted source information.\n"
-msgstr ""
-"ni Gushyiraho ku Hanyuma Byose amahuza Byabonetse in Idosiye Ryari: Byahiswemo ni Bivuye in Idosiye ku i Sisitemu ni Gicurasi "
-"Ibisobanuro ni ku Kitazwi Na i amahuza amahuza Kuri Cyangwa Umutekano Gushyiraho Kuri ku Inkomoko Ibisobanuro\n"
-
-#: src/LYrcFile.c:513
-#, fuzzy
-msgid ""
-"select_popups specifies whether the OPTIONs in a SELECT block which\n"
-"lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
-"buttons or via a popup menu.  Note that if the MULTIPLE attribute is\n"
-"present in the SELECT start tag, Lynx always will create a vertical list\n"
-"of checkboxes for the OPTIONs.  A value of \"on\" will set popup menus\n"
-"as the default while a value of \"off\" will set use of radio boxes.\n"
-"The default can be overridden via the -popup command line toggle.\n"
-msgstr ""
-"i in a Funga a IBIKORWA Ikiranga Nka a Bihagaritse Urutonde Bya Cyangwa Biturutse a Ibikubiyemo NIBA i IBIKORWA Ikiranga in i "
-"Gutangira Itagi: Buri gihe Kurema a Bihagaritse kugirango i A Agaciro Bya ku Gushyiraho i Mburabuzi a Agaciro Bya Bidakora "
-"Gushyiraho Gukoresha Bya Mburabuzi Biturutse i Komandi: Umurongo Mukomatanya\n"
-
-#: src/LYrcFile.c:523
-#, fuzzy
-msgid ""
-"show_color specifies how to set the color mode at startup.  A value of\n"
-"\"never\" will force color mode off (treat the terminal as monochrome)\n"
-"at startup even if the terminal appears to be color capable.  A value of\n"
-"\"always\" will force color mode on even if the terminal appears to be\n"
-"monochrome, if this is supported by the library used to build lynx.\n"
-"A value of \"default\" will yield the behavior of assuming\n"
-"a monochrome terminal unless color capability is inferred at startup\n"
-"based on the terminal type, or the -color command line switch is used, or\n"
-"the COLORTERM environment variable is set.  The default behavior always is\n"
-"used in anonymous accounts or if the \"option_save\" restriction is set.\n"
-"The effect of the saved value can be overridden via\n"
-"the -color and -nocolor command line switches.\n"
-"The mode set at startup can be changed via the \"show color\" option in\n"
-"the 'o'ptions menu.  If the option settings are saved, the \"on\" and\n"
-"\"off\" \"show color\" settings will be treated as \"default\".\n"
-msgstr ""
-"Kuri Gushyiraho i Ibara Ubwoko ku A Agaciro Nta narimwe Ibara Ubwoko Bidakora i Nka bararimwe ku ATARIIGIHARWE NIBA i Kuri Ibara "
-"A Agaciro Buri gihe Ibara Ubwoko ku ATARIIGIHARWE NIBA i Kuri NIBA iyi ni ku i Isomero Kuri A Agaciro Bya Mburabuzi Umusaruro i "
-"imyitwarire Bya bararimwe Ibara ni ku ku i Ubwoko Cyangwa i Ibara Komandi: Umurongo Hindura ni IMPINDURAGACIRO ni Gushyiraho "
-"Mburabuzi imyitwarire Buri gihe in Konti Cyangwa NIBA i ni Gushyiraho INGARUKA Bya i Agaciro Ibara Na Komandi: Umurongo Ubwoko "
-"Gushyiraho ku Byahinduwe Biturutse i Garagaza Ibara Ihitamo Ibikubiyemo i Ihitamo Amagenamiterere i ku Bidakora Garagaza Ibara "
-"Amagenamiterere Nka Mburabuzi\n"
-
-#: src/LYrcFile.c:540
-#, fuzzy
-msgid ""
-"show_cursor specifies whether to 'hide' the cursor to the right (and\n"
-"bottom, if possible) of the screen, or to place it to the left of the\n"
-"current link in documents, or current option in select popup windows.\n"
-"Positioning the cursor to the left of the current link or option is\n"
-"helpful for speech or braille interfaces, and when the terminal is\n"
-"one which does not distinguish the current link based on highlighting\n"
-"or color.  A value of \"on\" will set positioning to the left as the\n"
-"default while a value of \"off\" will set 'hiding' of the cursor.\n"
-"The default can be overridden via the -show_cursor command line toggle.\n"
-msgstr ""
-"Kuri i indanga Kuri i Iburyo: NIBA Bya i Mugaragaza Cyangwa Kuri Kuri i Ibumoso: Bya Ihuza in Inyandiko Cyangwa KIGEZWEHO Ihitamo "
-"in Guhitamo i indanga Kuri i Ibumoso: Bya i KIGEZWEHO Ihuza Cyangwa Ihitamo kugirango Cyangwa Na Ryari: i OYA i KIGEZWEHO Ihuza "
-"ku Ibara A Agaciro Bya ku Gushyiraho Kuri i Ibumoso: Nka a Agaciro Bya Bidakora Gushyiraho Bya i indanga Mburabuzi Biturutse i "
-"Komandi: Umurongo Mukomatanya\n"
-
-#: src/LYrcFile.c:551
-#, fuzzy
-msgid ""
-"show_dotfiles specifies that the directory listing should include\n"
-"\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
-"honored only if enabled via userdefs.h and/or lynx.cfg, and not\n"
-"restricted via a command line switch.  If display of hidden files\n"
-"is disabled, creation of such files via Lynx also is disabled.\n"
-msgstr ""
-"i bushyinguro gihishwe Akadomo Idosiye ububiko bw'amaderese Gushyiraho ku iyi NIBA Bikora Biturutse h Na Cyangwa Na Biturutse a "
-"Komandi: Umurongo Hindura Kugaragaza Bya gihishwe Yahagaritswe Bya Idosiye Biturutse ni Yahagaritswe\n"
-
-#: src/LYrcFile.c:562
-#, fuzzy
-msgid ""
-"If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
-"been defined (see below), then all bookmark operations will first\n"
-"prompt the user to select an active sub-bookmark file.  If the default\n"
-"Lynx bookmark_file is defined (see above), it will be used as the\n"
-"default selection.  When this option is set to \"advanced\", and the\n"
-"user mode is advanced, the 'v'iew bookmark command will invoke a\n"
-"statusline prompt instead of the menu seen in novice and intermediate\n"
-"user modes.  When this option is set to \"standard\", the menu will be\n"
-"presented regardless of user mode.\n"
-msgstr ""
-"ni OYA Bidakora Na Igikubo Ibirango munsi Hanyuma Byose Akamenyetso Ibikorwa: i Ukoresha: Kuri Guhitamo Gikora Akamenyetso "
-"IDOSIYE i ni hejuru Nka Ihitamo iyi Ihitamo ni Gushyiraho Kuri Urwego rwo hejuru Na Ubwoko ni Urwego rwo hejuru i Akamenyetso "
-"Komandi: Urwinjiriro Bya i Ibikubiyemo in Na iyi Ihitamo ni Gushyiraho Kuri Bisanzwe i Ibikubiyemo Bya Ukoresha: Ubwoko\n"
-
-#: src/LYrcFile.c:576
-#, fuzzy
-msgid ""
-"user_mode specifies the users level of knowledge with Lynx.  The\n"
-"default is \"NOVICE\" which displays two extra lines of help at the\n"
-"bottom of the screen to aid the user in learning the basic Lynx\n"
-"commands.  Set user_mode to \"INTERMEDIATE\" to turn off the extra info.\n"
-"Use \"ADVANCED\" to see the URL of the currently selected link at the\n"
-"bottom of the screen.\n"
-msgstr ""
-"i urwego Bya Na: ni Birenga Imirongo Bya Ifashayobora ku Bya i Mugaragaza Kuri i Ukoresha: in i BASIC Kuri Kuri Bidakora i "
-"Birenga Ibisobanuro Kuri i Bya i Byahiswemo Ihuza ku Bya i Mugaragaza\n"
-
-#: src/LYrcFile.c:585
-#, fuzzy
-msgid ""
-"If verbose_images is \"on\", lynx will print the name of the image\n"
-"source file in place of [INLINE], [LINK] or [IMAGE]\n"
-"See also VERBOSE_IMAGES in lynx.cfg\n"
-msgstr "ni ku Gucapa i Izina: Bya i IDOSIYE in Bya Cyangwa in\n"
-
-#: src/LYrcFile.c:590
-#, fuzzy
-msgid ""
-"If vi_keys is set to \"on\", then the normal VI movement keys:\n"
-"  j = down    k = up\n"
-"  h = left    l = right\n"
-"will be enabled.  These keys are only lower case.\n"
-"Capital 'H', 'J' and 'K will still activate help, jump shortcuts,\n"
-"and the keymap display, respectively.\n"
-msgstr ""
-"ni Gushyiraho Kuri ku Hanyuma i Bisanzwe Igenda Utubuto j Hasi K h Ibumoso: L Bikora Utubuto Ntoya Na Kureka bigakora "
-"Ifashayobora Simbuka Na i Kugaragaza\n"
-
-#: src/LYrcFile.c:598
-#, fuzzy
-msgid ""
-"The visited_links setting controls how Lynx organizes the information\n"
-"in the Visited Links Page.\n"
-msgstr "Igenamiterere Amagenzura i i\n"
-
-#: src/LYrcFile.c:819
-#, fuzzy
-msgid ""
-"If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
-"your keypad when the numlock is on will act as arrow keys:\n"
-"            8 = Up Arrow\n"
-"  4 = Left Arrow    6 = Right Arrow\n"
-"            2 = Down Arrow\n"
-"and the corresponding keyboard numbers will act as arrow keys,\n"
-"regardless of whether numlock is on.\n"
-msgstr ""
-"ni Gushyiraho Kuri Hanyuma i Imibare Ryari: i ni ku Nka Akambi Utubuto 8 4. 6 2. i Mwandikisho Imibare Nka Akambi Utubuto Bya ni "
-"ku\n"
-
-#: src/LYrcFile.c:828
-#, fuzzy
-msgid ""
-"If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
-"appear next to each link and numbers are used to select links.\n"
-msgstr "ni Gushyiraho Kuri Hanyuma Imibare Komeza>> Kuri Ihuza Na Imibare Kuri Guhitamo amahuza\n"
-
-#: src/LYrcFile.c:832
-#, fuzzy
-msgid ""
-"If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
-"numbers will appear next to each link and visible form input field.\n"
-"Numbers are used to select links, or to move the \"current link\" to a\n"
-"form input field or button.  In addition, options in popup menus are\n"
-"indexed so that the user may type an option number to select an option in\n"
-"a popup menu, even if the option isn't visible on the screen.  Reference\n"
-"lists and output from the list command also enumerate form inputs.\n"
-msgstr ""
-"ni Gushyiraho Kuri Kugaragara Komeza>> Kuri Ihuza Na Kigaragara Ifishi Iyinjiza Umwanya Kuri Guhitamo amahuza Cyangwa Kuri "
-"Kwimura i KIGEZWEHO Ihuza Kuri Iyinjiza Umwanya Cyangwa Akabuto Guteranya+ Amahitamo in Ibikubiyemo i Ukoresha: Gicurasi Ubwoko "
-"Ihitamo Umubare Kuri Guhitamo Ihitamo Ibikubiyemo ATARIIGIHARWE NIBA i Ihitamo si Kigaragara ku i Mugaragaza Na Ibisohoka Bivuye "
-"i Urutonde Komandi: Ifishi\n"
-
-#: src/LYrcFile.c:841
-#, fuzzy
-msgid ""
-"NOTE: Some fixed format documents may look disfigured when\n"
-"\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
-"enabled.\n"
-msgstr "BIHAMYE Imiterere Inyandiko Gicurasi Cyangwa\n"
-
-#: src/LYrcFile.c:873
-msgid ""
-"Lynx User Defaults File\n"
-"\n"
-msgstr ""
-
-#: src/LYrcFile.c:882
-msgid ""
-"This file contains options saved from the Lynx Options Screen (normally\n"
-"with the 'o' key).  To save options with that screen, you must select the\n"
-"checkbox:\n"
-msgstr ""
-
-#: src/LYrcFile.c:889
-msgid ""
-"You must then save the settings using the link on the line above the\n"
-"checkbox:\n"
-msgstr ""
-
-#: src/LYrcFile.c:896
-msgid ""
-"You may also use the command-line option \"-forms_options\", which displays\n"
-"the simpler Options Menu instead.  Save options with that using the '>' key.\n"
-"\n"
-msgstr ""
-
-#: src/LYrcFile.c:903
-msgid ""
-"This file contains options saved from the Lynx Options Screen (normally\n"
-"with the '>' key).\n"
-"\n"
-msgstr ""
-
-#: src/LYrcFile.c:910
-#, fuzzy
-msgid ""
-"There is normally no need to edit this file manually, since the defaults\n"
-"here can be controlled from the Options Screen, and the next time options\n"
-"are saved from the Options Screen this file will be completely rewritten.\n"
-"You have been warned...\n"
-"\n"
-"If you are looking for the general configuration file - it is normally\n"
-"called \"lynx.cfg\".  It has different content and a different format.\n"
-"It is not this file.\n"
-msgstr ""
-"IDOSIYE Kirimo Amahitamo Bivuye i i Urufunguzo ni Oya Kuri Guhindura iyi IDOSIYE guhera i Bivuye i Na Igihe Amahitamo Bivuye i "
-"iyi IDOSIYE kugirango i Rusange Iboneza IDOSIYE ni Na Ibikubiyemo Na a Imiterere ni OYA iyi IDOSIYE\n"
-
-#, fuzzy
-#~ msgid "reason unknown."
-#~ msgstr "Kitazwi"
-
-#, fuzzy
-#~ msgid "Short read from file, problem?"
-#~ msgstr "Gusoma Bivuye IDOSIYE"
-
-#~ msgid "KB"
-#~ msgstr "KB"
-
-#, fuzzy
-#~ msgid "Remove '%s' and all of its contents?"
-#~ msgstr "Na Byose Bya Ibigize"
-
-#, fuzzy
-#~ msgid "Remove directory and all of its contents?"
-#~ msgstr "bushyinguro Na Byose Bya Ibigize"
-
-#, fuzzy
-#~ msgid "Unable to open file management menu file."
-#~ msgstr "Kuri Gufungura IDOSIYE Ibikubiyemo IDOSIYE"
diff --git a/po/sl.po b/po/sl.po
index 00a121ac..81296a27 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,13 +1,14 @@
 # Slovenian translation of Lynx WWW browser.
 # Copyright (C) 1999 Free Software Foundation, Inc.
 # Roman Maurer <roman.maurer@hermes.si>, 1999.
-# $LynxId: sl.po,v 1.39 2008/09/21 23:28:31 tom Exp $
+# $Id: sl.po,v 1.40 2008/12/08 01:03:02 tom Exp $
+# $Source: /usr/build/VCS/lynx/po/RCS/sl.po,v $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\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"
@@ -2168,7 +2169,7 @@ msgstr ""
 " Prosim, spodaj vnesite svoje sporoèilo."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2177,7 +2178,7 @@ msgstr ""
 " Ko opravite, pritisnite Enter in vstavite eno samo piko (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2814,7 +2815,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Nalaganje nepopolno."
 
@@ -2837,7 +2838,7 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Ne moremo dostopati"
 
@@ -3037,7 +3038,7 @@ msgstr ""
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -3046,39 +3047,39 @@ msgstr ""
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Neveljavno ime gostitelja %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "vtiènici je spodletelo."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
+#: WWW/Library/Implementation/HTTCP.c:2016
+msgid "Socket read failed (too many tries)."
 msgstr ""
 
 #: WWW/Library/Implementation/HTTP.c:84
@@ -3491,35 +3492,35 @@ msgstr "polje za generiranje kljuèa"
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 #, fuzzy
 msgid "Can't open file for uploading"
 msgstr "Ne moremo odpreti izhodne datoteke!  Prekinitev!"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "zlogov"
 
@@ -3678,7 +3679,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr ""
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3687,23 +3688,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr ""
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Dober nasvet"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Izvrsten stre¾nik HTTP za VMS je dostopen prek"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "te povezave"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Ponuja naravnost umetni¹ko podporo za skripte CGI.\n"
 
@@ -3938,273 +3939,273 @@ msgstr "Sklici"
 msgid "Visible links"
 msgstr "Vidne povezave"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr ""
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr ""
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr ""
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr ""
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr ""
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr ""
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Predolga pot"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr ""
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr ""
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr ""
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr ""
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr ""
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr ""
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr ""
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr ""
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr ""
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr ""
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr ""
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, fuzzy, c-format
 msgid "Remove directory '%s'?"
 msgstr " imenik"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
 msgstr " imenik"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr ""
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 #, fuzzy
 msgid "Remove symbolic link?"
 msgstr "Simbolna povezava"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr ""
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr ""
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr ""
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Lastnik:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Skupina"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Drugi:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr ""
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr ""
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr ""
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr ""
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Izvajamo %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr ""
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Trenutni imenik:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr ""
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr ""
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr ""
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr ""
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr ""
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr ""
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr ""
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr ""
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr ""
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, fuzzy, c-format
 msgid "Already in target directory: %s"
 msgstr "Beremo imenik..."
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr ""
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr ""
 
@@ -4243,21 +4244,21 @@ msgstr ""
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Vtiènica Winsock ¾al ni bila najdena."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 #, fuzzy
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "MORATE nastaviti veljavno podroèje TMP ali TEMP!\n"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 #, fuzzy
 msgid "No such directory"
 msgstr " imenik"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4268,7 +4269,7 @@ msgstr ""
 "Nastavitvena datoteka %s ni dostopna.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4279,7 +4280,7 @@ msgstr ""
 "Nabor znakov za Lynx ni bil doloèen.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4290,7 +4291,7 @@ msgstr ""
 "Urejevalna preslikava za Lynx ni bila doloèena.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4301,70 +4302,70 @@ msgstr ""
 "Datoteka %s za Lynx< ni dostopna.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "stanje obstojnih pi¹kotov bo spremenjeno le v naslednji seji."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr ""
 "\n"
 "%s Razlièica %s (%.*s)\n"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Zgrajena na %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Pravice raz¹irjanja imajo Univerza v Kansasu, CERN in drugi sodelavci.\n"
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Raz¹irjano pod Splo¹no licenco GNU.\n"
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
@@ -4393,7 +4394,7 @@ msgstr ""
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr ""
 
@@ -4419,67 +4420,67 @@ msgstr ""
 msgid "failed to change directory"
 msgstr "Ne moremo dostopati do imenika."
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 #, fuzzy
 msgid "Current URL is empty."
 msgstr "Trenutni imenik:"
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 #, fuzzy
 msgid "-index-"
 msgstr " stvarno kazalo"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr ""
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr ""
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr ""
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr ""
 
@@ -4487,7 +4488,7 @@ msgstr ""
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4498,14 +4499,14 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
 " Please provide or edit the Subject: header\n"
 msgstr ""
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4515,14 +4516,14 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
 " Please enter your message below."
 msgstr ""
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr ""
 
@@ -5184,38 +5185,38 @@ msgstr ""
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Prosim, preberite dokumentacijo v distribuciji"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "za veè pripomb."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr ""
 
@@ -5251,28 +5252,28 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr ""
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr ""
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 #, fuzzy
 msgid "Name of owner:"
 msgstr "©tevilo vrstic:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr ""
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr ""
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 #, fuzzy
 msgid "(bytes)"
 msgstr "zlogov"
@@ -5280,162 +5281,162 @@ msgstr "zlogov"
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr ""
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr ""
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr ""
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr ""
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 #, fuzzy
 msgid "Group:"
 msgstr "Skupina"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr ""
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr ""
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr ""
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr ""
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr ""
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr ""
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr ""
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr ""
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr ""
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr ""
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr ""
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr ""
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr ""
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr ""
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr ""
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr ""
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr ""
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ""
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 #, fuzzy
 msgid ", via internal link"
 msgstr " (je bil notranji)"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ""
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ""
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ""
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr ""
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr ""
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr ""
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr ""
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 #, fuzzy
 msgid "Action:"
 msgstr "Lokacija: "
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr ""
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr ""
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr ""
 
@@ -5482,34 +5483,34 @@ msgstr ""
 msgid "Upload options:"
 msgstr ""
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 #, fuzzy
 msgid "unknown restriction"
 msgstr "neznano polje ali povezava"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, fuzzy, c-format
 msgid "Restrictions set:\n"
 msgstr "Opis:"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index c1a7351a..45bf848b 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.7-dev9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 2008-07-16 06:09+0100\n"
 "Last-Translator: Peter Karlsson <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -2159,7 +2159,7 @@ msgstr ""
 " Skriv ditt meddelande nedan."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2168,7 +2168,7 @@ msgstr ""
 " När du är klar, tryck Enter och skriv en ensam punkt (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2803,7 +2803,7 @@ msgstr "Dokument med POST-data hittades ej i cache. Skicka in igen?"
 msgid "Loading failed, use a previous copy."
 msgstr "Hämtningen misslyckades, använder tidigare exemplar."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Hämtning ej komplett."
 
@@ -2826,7 +2826,7 @@ msgstr "**** HTAccess: Returnerad status var: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Kan inte komma åt"
 
@@ -3031,7 +3031,7 @@ msgstr "Adressen har en ogiltig port"
 msgid "Address length looks invalid"
 msgstr "Adresslängden verkar ogiltig"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Kan inte hitta värd %s."
@@ -3040,40 +3040,41 @@ msgstr "Kan inte hitta värd %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ogiltigt värdnamn %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Kopplar upp %s-anslutning till %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "uttag misslyckades."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, 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:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Kunde inte koppla upp icke-blockerande anslutning."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "Uppkoppling misslyckades (för många försök)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Kunde inte återställa blockering i uttag."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "Läsning från uttag misslyckades 180.000 gånger."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Uppkoppling misslyckades (för många försök)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3491,34 +3492,34 @@ msgstr "nyckelgenerering misslyckades"
 msgid "unknown form field"
 msgstr "okänt formulärfält"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "Kan inte öppna fil för sändning"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Skickar %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Hängning upptäckt: TextAnchor-struktur förstörd - föreslår avbrott!"
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ombryt rader så att de passar i visat fält?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Mycket långa rader har ombrutits!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "mycket långa rader har trunkerats!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "byte"
 
@@ -3693,7 +3694,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Filen kan kanske återskapas från %s under denna session"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Vill du starta \"%s\"?"
@@ -3702,23 +3703,23 @@ msgstr "Vill du starta \"%s\"?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Kan inte nå cgi-skript"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Gott råd"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "En utmärkt http-server för VMS är tillgänglig via"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "denna länk"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Den ger förstklassigt stöd för CGI-skript.\n"
 
@@ -3950,271 +3951,271 @@ msgstr "Referenser"
 msgid "Visible links"
 msgstr "Synliga länkar"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Kan inte ta status på \"%s\"."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Vald post är inte en fil eller en katalog! Begäran ignoreras."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Kan inte %s på grund av systemfel!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Möjligt misslyckande i %s på grund av systemfel!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "ta bort %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr "ändra datum på %s"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "flytta %s till %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Det finns redan en katalog med det namnet! Begäran ignoreras."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Det finns redan en fil med det namnet! Begäran ignoreras."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Angivet filnamn används redan! Begäran ignoreras."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "Målet har annan ägare! Begäran avvisas."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Målet är inte en giltig katalog! Begäran avvisas."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Ta bort alla markerade filer och kataloger?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Ange ny plats för markerade poster: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Sökväg för lång"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Källa och mål är samma - begäran ignoreras!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Ange nytt namn för katalog: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Ange nytt namn för fil: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Felaktigt tecken (sökvägsavdelare) funnen! Begäran ignorerad."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Ange ny plats för katalog: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Ange ny plats för fil: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Oväntat misslyckande - kan inte hitta avslutande sökvägsavdelare"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Källa och mål är samma plats! Begäran ignorerad."
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Ända N=namn, L=plats eller P=behörighet? "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Ändra N=namn eller L=plats? "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Denna funktion är ännu ej implementerad!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Ange namn på fil att skapa: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Felaktig omdirigering \"//\" funnen! Begäran ignoreras."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Ange namn på ny katalog: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Skapa F=fil eller D=katalog? "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Ta bort katalogen \"%s\"?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
 msgstr "Ta bort katalogen?"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Ta bort fil \"%s\"?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Ta bort fil?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Ta bort symbolisk länk \"%s\"?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Ta bort symbolisk länk?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Tyvärr, kan inte ändra behörighet för icke-Unixfiler ännu."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Kan inte öppna behörighetsalternativfil"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Ange behörighet nedan:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Ägare:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Grupp"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Övriga:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "formulär för att ändra behörighet för"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Ogiltigt format på behörighet."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Ogiltig syntaxformat."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Varning! UU-avkodad fil lagras i katalogen du startade Lynx från."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "URL-pekare är NULL"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Kör %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Kör systemkommando. Detta kan ta en stund."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Aktuell katalog:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Aktuell markering:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Ingenting har markerats."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "markerad post:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "markerade poster:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Ogiltigt filnamn; begäran ignorerad."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Installation i vald katalog ej tillåten."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Vald post är inte en katalog! Begäran ignorerad."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Ett ögonblick, ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr "Fel vid uppbyggning av installationsflaggor"
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Källa och mål är samma: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Redan i målkatalog: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Installation färdig"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "Temporär adress eller lista skulle vara för lång."
 
@@ -4253,19 +4254,19 @@ msgstr "Detta meddelande automatgenererades av"
 msgid "No system mailer configured"
 msgstr "E-postprogram inte konfigurerat i systemet"
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Ingen Winsock hittades, ursäkta."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Du MÅSTE ange ett giltigt TMP- eller TEMP-område!"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Katalogen finns ej"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4276,7 +4277,7 @@ msgstr ""
 "Konfigurationsfilen \"%s\" ej tillgänglig.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4287,7 +4288,7 @@ msgstr ""
 "Lynxteckenuppsättningar ej deklarerade.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4298,7 +4299,7 @@ msgstr ""
 "Lynxredigeringskarta ej deklarerad.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4309,66 +4310,66 @@ msgstr ""
 "Lynxfilen \"%s\" ej tillgänglig.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Ignorerade %d tecken från standard in.\n"
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Använd \"-stdin\" eller \"-\" för att beskriva hur indata från rör skall hanteras.\n"
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Varning:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "varaktiga kakinställningar ändras endast i nästa session."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignorerar okänd teckenuppsättning %s\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s version %s (%s)"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Byggd %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Upphovsrätten ligger hos Lynx-utvecklargruppen,"
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Kansas Universitet, CERN, och andra bidragslämnare."
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Distribuerad enligt GNU General Public License (version 2)."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Se http://lynx.isc.org/ och direkthjälpen för ytterligare information."
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "ANVÄNDNING: %s [flaggor] [fil]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Flaggorna är:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Okänd flagga: %s\n"
@@ -4397,7 +4398,7 @@ msgstr "Hjälpskärm"
 msgid "System Index"
 msgstr "Systemindex"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Ingång till huvudskärm"
 
@@ -4421,67 +4422,67 @@ msgstr "En del av sökvägen är inte en katalog"
 msgid "failed to change directory"
 msgstr "lyckades inte byta katalog"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Tolkar om dokumentet med aktuella inställningar..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatalt fel - kunde inte öppna utdatafil %s\n"
 
 # Kollas!
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr "Tabellcentrering aktiverad."
 
 # Kollas!
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr "Tabellcentrering inaktiverad."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "Nuvarande adress är tom."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Misslyckades kopiera till urklipp."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "Dokumentadress lagd i urklipp."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "Länkadress lagd i urklipp."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "Ingen adress i urklipp."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Kan inte komma åt startfil"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Startfilen hittades inte eller är varken text/html eller text/plain"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Avslutar..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-mer-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Du kommer att skicka till:"
 
@@ -4489,7 +4490,7 @@ msgstr "Du kommer att skicka till:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4503,7 +4504,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4513,7 +4514,7 @@ msgstr ""
 "\n"
 " Ange eller redigera ärenderaden\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4526,7 +4527,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4536,7 +4537,7 @@ msgstr ""
 "\n"
 " Skriv ditt inlägg nedan."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Inlägget har ingen ursprunglig text!"
 
@@ -5189,38 +5190,38 @@ msgstr "Lynx: kan inte börja, CERN-regelfilen %s ej tillgänglig\n"
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Mer än %d staplade lynx.cfg-inkluderingar -- kanske en slinga?!?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Sista försökta inkludering var \"%s\",\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inkluderad från \"%s\".\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Följande läses från din lynx.cfg-fil."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Se distributionens"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "för ytterligare kommentarer."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "HÄMTA OM ÄNDRINGARNA"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Din primära konfiguration"
 
@@ -5256,186 +5257,186 @@ msgstr "Markerade poster"
 msgid "Full name:"
 msgstr "Fullt namn:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Kan inte följa länk"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Pekar på fil:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Namn på ägare:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Gruppnamn:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Filstorlek:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr "(byte)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Skapad den:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Senast ändrad:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Senast åtkommen:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Åtkomstbehörighet"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr "Grupp:"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr "Övriga:"
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Visad fil"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Länknamn:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Teckenuppsättning:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr "(antogs)"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Senaste ändring:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr "Utgår:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Cachekontroll:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Datalängd:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr "Längd:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Språk:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "\"POST\"-data:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "\"POST\"-datatyp:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Ägare:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "storlek:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "rader"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "formulärläge"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "källkod"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", säker"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", via intern länk"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", ingen cache"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", ISMAP-skript"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", bokmärkesfil"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "läge:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Markerad länk"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Metod:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Kodningstyp:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr "Åtgärd:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Formulärfält)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Ingen länk på aktuell sida"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr "Serverhuvuden:"
 
@@ -5488,33 +5489,33 @@ msgstr "Skicka till:"
 msgid "Upload options:"
 msgstr "Insändningsalternativ:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr "Adress till hämtat dokument lagt i urklipp."
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Oväntat åtkomstprotokoll för denna adresstyp."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "För många temporärfiler"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "okänd begränsning"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Inga begränsningar satta.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Satta begränsningar:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "Hittar inte hemkatalogen (HOME)"
 
@@ -6097,6 +6098,9 @@ msgstr ""
 "lynx.cfg, och har annat innehåll och ett annat format. Det är inte denna\n"
 "fil.\n"
 
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "Läsning från uttag misslyckades 180.000 gånger."
+
 #~ msgid "History List maximum reached!  Document not pushed."
 #~ msgstr "Historiklistemaximum nått! Dokumentet lagrades inte."
 
diff --git a/po/tr.po b/po/tr.po
index 785f1e5d..069913b2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx-2.8.7-dev9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 2008-07-11 21:15-0400\n"
 "Last-Translator: Eyüp Hakan Duran <hakan_duran@hotmail.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -2159,7 +2159,7 @@ msgstr ""
 " Lütfen mesajýnýzý aþaðýya giriniz."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2168,7 +2168,7 @@ msgstr ""
 " Bitirdiðinizde enter'a basýp, yeni satýra tek bir nokta (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2803,7 +2803,7 @@ msgstr "Önbellekte POST içerikli belge bulunmadý.  Yeniden gönderilsin mi?"
 msgid "Loading failed, use a previous copy."
 msgstr "Yükleme baþarýsýz, önceki bir kopyayý kullanýn."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Yükleme tamamlanmadý."
 
@@ -2826,7 +2826,7 @@ msgstr "**** HTAccess: Dönen durum: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Eriþilemiyor"
 
@@ -3031,7 +3031,7 @@ msgstr "Adres portu geçersiz"
 msgid "Address length looks invalid"
 msgstr "Adres uzunluðu geçersiz görünüyor"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "%s adlý karþý makina konumlandýrýlamýyor."
@@ -3040,40 +3040,41 @@ msgstr "%s adlý karþý makina konumlandýrýlamýyor."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Geçersiz makina adý %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%2$s'e %1$s baðlantýsý kuruluyor"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "soket baþarýsýz."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "soket baþarýsýz: aile %d adres %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Baðlantý engelsizleþtirilemedi (non-blocking)."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "Baðlantý baþarýsýz (çok sayýda yeniden deneme)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Soket engellemeye (blocking) geri yüklenemedi."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "Soket okunmasý 180,000 kez baþarýsýz."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Baðlantý baþarýsýz (çok sayýda yeniden deneme)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3488,34 +3489,34 @@ msgstr "keygen alaný"
 msgid "unknown form field"
 msgstr "bilinmeyen form alaný"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "Yüklemek için dosya açýlamýyor."
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "%s gönderiliyor"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Takýlma Saptandý: TextAnchor struct bozuk - sonlandýrmanýz önerilir!"
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Görüntülenen alana sýðmak üzere satýrlar sarmalansýn mý?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Çok uzun satýrlar sarmalandý!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "Çok uzun satýrlarýn sonundan kýrpýldý!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "bayt"
 
@@ -3689,7 +3690,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Dosya, bu oturum boyunca %s'den kurtarýlabilir"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "\"%s\"'i çalýþtýrmak ister misiniz?"
@@ -3698,23 +3699,23 @@ msgstr "\"%s\"'i çalýþtýrmak ister misiniz?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "cgi betiðine eriþilemiyor"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Ýyi Öneri"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "VMS için kusursuz bir http sunucusu, þu link aracýlýðýyla"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "temin edilebilir"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Güncel CGI betik desteðini saðlar.\n"
 
@@ -3946,271 +3947,271 @@ msgstr "Referanslar"
 msgid "Visible links"
 msgstr "Görünür linkler"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "'%s'in durumu alýnamýyor."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Seçilen öðe bir dosya ya da dizin deðil!  Ýstem yoksayýldý."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Sistem hatasý nedeniyle %s yapýlamýyor!"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Sistem hatasý nedeniyle olasý %s baþarýsýzlýðý!"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "%s'i çýkart"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr "%s'e dokun"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "%s'i %s'e taþý"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "O isimde bir dizin zaten var!  Ýstem yoksayýldý."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "O isimde bir dosya zaten var!  Ýstem yoksayýldý."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Belirtilmiþ isim zaten kullanýmda!  Ýstem yoksayýldý."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "Varýþ yerinin sahibi farklý!  Ýstem reddedildi."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Varýþ yeri geçerli bir dizin deðil!  Ýstem reddedildi."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Bütün iþaretlenmiþ dosya ve dizinler çýkartýlsýn mý?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Ýþaretlenmiþ öðeler için yeni konum giriniz: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "Yol çok uzun"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Çýkýþ ve varýþ konumlarý ayný - istem yoksayýldý!"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Dizin için yeni isim giriniz: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Dosya için yeni isim giriniz: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Kuraldýþý karakter (yol-ayracý) bulundu! Ýstem yoksayýldý."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Dizin için yeni konum giriniz: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Dosya için yeni konum giriniz: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Umulmadýk aksaklýk - izleme yolu ayracý bulunamadý"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Çýkýþ ve varýþ konumlarý ayný!  Ýstem yoksayýldý!"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Ýsim(n), konum(l) ya da izin(p) deðiþtirme: "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Ýsim(n) ya da konum(l) deðiþtirme: "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Bu nitelik daha tamamlanmadý!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Oluþturulacak dosyanýn adýný giriniz: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Kuraldýþý yeniden yönlendirme \"//\" bulundu! Ýstem yoksayýldý."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Yeni dizin için isim giriniz: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Dosya(f) ya da dizin(d) oluþtur: "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "'%s' dizini çýkartýlsýn mý?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
 msgstr "Dizin çýkarýlsýn mý?"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "'%s' dosyasý çýkartýlsýn mý?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Dosya çýkartýlsýn mý?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "'%s' simgesel linki çýkartýlsýn mý?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Simgesel link çýkartýlsýn mý?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Üzgünüm, daha UNIX-dýþý dosyalara nasýl izin verileceði bilinmiyor."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Ýzin seçenekleri dosyasý açýlamýyor"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Ýzinleri aþaðýda belirtin:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Sahip:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Grup"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Diðerleri:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "izin verilecek form"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Kip biçemi geçersiz."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Betik biçemi geçersiz."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Uyarý!  UUçözülmüþ dosya, Lynx'i baþlattýðýnýz dizinde yer alacak."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "BOÞ URL imleyici"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "%s icra ediliyor "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Sistem komutu icra ediliyor. Bu, bir süre alabilir."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Mevcut dizin:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Mevcut seçim:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Halen hiçbir þey.seçili deðil."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "iþaretlenmiþ öðe:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "iþaretlenmiþ öðeler:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Kuraldýþý dosya adý; istem yoksayýldý."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Seçili dizine kurmaya izin verilmiyor."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Seçili öðe bir dizin deðil! Ýstem yoksayýldý."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "Bir dakikacýk, ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr "Kurma arg'larýný yapýlandýrmada hata"
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Kaynak ve hedef ayný: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Zaten hedef dizinde: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Kurma tamamlandý"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "Geçici URL ya da liste çok uzun olacaktý."
 
@@ -4249,19 +4250,19 @@ msgstr "Bu mesajý otomatik olarak oluþturan"
 msgid "No system mailer configured"
 msgstr "Ayarlanmýþ sistem postacýsý yok"
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Winsock bulunamadý, üzgünüm."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Geçerli bir TMP ya da TEMP alaný tanýmlamalýsýnýz!"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Böyle bir dizin yok"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4272,7 +4273,7 @@ msgstr ""
 "Ayarlama dosyasý \"%s\" temin edilemiyor.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4283,7 +4284,7 @@ msgstr ""
 "Lynx karakter kümeleri bildirilmemiþ.\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4294,7 +4295,7 @@ msgstr ""
 "Lynx düzenleme eþlemi bildirilmemiþ.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4305,66 +4306,66 @@ msgstr ""
 "Lynx dosyasý \"%s\" temin edilemiyor.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Standart girdiden %d karakter yok sayýldý.\n"
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Veriyolu girdisinin nasýl halledileceðini belirtmek için \"-stdin\" ya da \"-\" kullanýn.\n"
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Uyarý:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "kalýcý çerezler durumu, yalnýzca gelecek oturumda deðiþecek."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: tanýnmayan karakterkümesi=%s yoksayýlýyor\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Sürüm %s (%s)"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "%s %s %s üzerine yapýlandýrýldý\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Telif haklarý Lynx Geliþtirme Grubu,"
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Kansas Üniversitesi, CERN ve diðer katýlýmcýlar tarafýndan (saklý) tutulmaktadýr."
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "GNU Genel Kamu Lisansý (Sürüm 2) altýnda daðýtýlmaktadýr."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Daha fazla bilgi için http://lynx.isc.org/ ve çevrim içi yardýma bakýnýz."
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "KULLANIM: %s [seçenekler] [dosya]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Seçenekler:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Geçersiz Seçenek: %s\n"
@@ -4393,7 +4394,7 @@ msgstr "Yardým Ekraný"
 msgid "System Index"
 msgstr "Sistem Ýndeksi"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Ana ekrana giriþ"
 
@@ -4417,65 +4418,65 @@ msgstr "Yolun bileþenlerinden biri dizin deðildir"
 msgid "failed to change directory"
 msgstr "dizin deðiþtirme baþarýsýz"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Mevcut ayarlarla belge yeniden ayrýþtýrýlýyor..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Ölümcül hata - çýktý dosyasý %s açýlamýyor\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr "TABLO ortala(mayý) etkinleþtir."
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr "TABLO ortala(mayý) devre dýþý býrak."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "Mevcut URL boþ."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Panoya kopyalama baþarýsýz."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "Belge URL'sini panoya koy."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "Link URL'sini panoya koy."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "Panoda URL yok."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-indeks-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: baþlat dosyasýna (startfile) eriþilemiyor"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Baþlat dosyasý bulunamýyor ya da html-metin ya da salt-metin deðil"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Kapanýyor..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-devam-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Postalayacaðýnýz yer/kiþi:"
 
@@ -4483,7 +4484,7 @@ msgstr "Postalayacaðýnýz yer/kiþi:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4497,7 +4498,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4507,7 +4508,7 @@ msgstr ""
 "\n"
 " Lütfen Konu: hanesini giriniz ya da düzenleyiniz\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4520,7 +4521,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4530,7 +4531,7 @@ msgstr ""
 "\n"
 " Lütfen mesajýnýzý aþaðýya giriniz."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Mesajda orijinal metin yok!"
 
@@ -5182,38 +5183,38 @@ msgstr "Lynx: baþlayamýyor, CERN kurallarý dosyasý %s temin edilemiyor\n"
 msgid "(no name)"
 msgstr "(isimsiz)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "lynx.cfg içermeleri, %d'den çok içiçe geçmiþ -- belki bir döngü olmasýn?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Son kalkýþýlan içerme '%s' idi,\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "'%s'den içerilmiþti.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Aþaðýdaki, lynx.cfg dosyanýzdan okunmuþtur."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Lütfen daha fazla yorum için"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "daðýtýmý okuyunuz."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "DEÐÝÞÝKLÝKLERÝ YENÝDEN YÜKLE"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Birincil ayarlarýnýz"
 
@@ -5249,186 +5250,186 @@ msgstr "Halen seçilmiþ öðe"
 msgid "Full name:"
 msgstr "Tam isim:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Link takip edilemiyor"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Ýmlediði dosya:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Sahibinin adý:"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Grup adý:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Dosya boyutu:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr "(bayt)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Oluþturulma tarihi:"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Son deðiþiklik:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Son eriþim:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Eriþim Ýzinleri"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr "Grup:"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr "Dünya:"
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Halen görüntülediðiniz dosya"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Link adý:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Karakter Kümesi:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr "(varsayýldý)"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Sunucu:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Tarih:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Son Kip:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr "Zamanaþýmý tarihi:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Önbellek-Konrolü:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "Ýçerik Uzunluðu:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr "Uzunluk:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Dil:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "Post Verisi:"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "Post Ýçerik Tipi:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Sahip(ler):"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "boyut:"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "satýr"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "form kipi"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "kaynak"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", güvenli"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", dahili link aracýlýðýyla"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", ön belleksiz"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", ISMAP betiði"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", yer imi dosyasý"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "kip:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Halen seçmiþ olduðunuz link"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Yöntem:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Enctipi:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr "Eylem:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Form alaný)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Mevcut sayfada link yok"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr "Sunucu Baþlýklarý:"
 
@@ -5481,33 +5482,33 @@ msgstr "Yüklenecek yer:"
 msgid "Upload options:"
 msgstr "Yükleme seçenekleri:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr "Belge indirme URL'sini panoya koy."
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Bu URL þemasý için umulmadýk eriþim protokolü."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "Çok sayýda geçici dosya"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "bilinmeyen kýsýtlama"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Hiçbir kýsýtlama kurulmamýþ.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Kurulmuþ kýsýtlamalar:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "EV dizini bulunamýyor"
 
@@ -6089,3 +6090,6 @@ msgstr ""
 "Eðer genel ayarlama dosyasýný arýyorsanýz - normalde lynx.cfg olarak\n"
 "anýlýr, onun farklý bir içeriði ve biçemi vardýr.\n"
 "O, bu dosya deðildir.\n"
+
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "Soket okunmasý 180,000 kez baþarýsýz."
diff --git a/po/uk.po b/po/uk.po
index 1099243b..c0286618 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,v 1.31 2008/09/21 21:04:25 tom Exp $
+# $Id: uk.po,v 1.32 2008/12/08 01:03:07 tom Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.5pre9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\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"
@@ -2222,7 +2222,7 @@ msgstr ""
 " âÕÄØ ÌÁÓËÁ, ÎÁÂÅÒ¦ÔØ ×ÁÛÅ ÐÏצÄÏÍÌÅÎÎÑ ÎÉÖÞÅ."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2231,7 +2231,7 @@ msgstr ""
 " ëÏÌÉ ÚÁ˦ÎÞÉÔÅ, ÎÁÔÉÓÎ¦ÔØ ××¦Ä ÔÁ ××ÅÄ¦ÔØ ÏÄÎÕ ËÒÁÐËÕ (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2881,7 +2881,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "úÁ×ÁÎÔÁÖÅÎÎÑ ÎÅ ÚÁ×ÅÒÛÅÎÏ."
 
@@ -2904,7 +2904,7 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ"
 
@@ -3113,7 +3113,7 @@ msgstr "áÄÒÅÓÁ ÍÁ¤ ÎÅצÒÎÏÇÏ ÐÏÒÔÕ"
 msgid "Address length looks invalid"
 msgstr "äÏ×ÖÉÎÁ ÁÄÒÅÓÉ, ÓÈÏÖÅ, ÎÅצÒÎÁ"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ×¦ÄÄÁÌÅÎÉÊ ÓÅÒ×ÅÒ %s."
@@ -3122,40 +3122,41 @@ msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ×¦ÄÄÁÌÅÎÉÊ ÓÅÒ×ÅÒ %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "îÅÐÒÁ×ÉÌØÎÅ ¦Í'Ñ ÍÁÛÉÎÉ %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "÷ÓÔÁÎÏ×ÌÀ¤ÍÏ %s Ú'¤ÄÎÁÎÎÑ ÄÏ %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "ú'¤ÄÎÁÔÉÓÑ ÎÅ ×ÄÁÌÏÓÑ (ÚÁÂÁÇÁÔÏ ÓÐÒÏÂ)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr ""
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "ú'¤ÄÎÁÔÉÓÑ ÎÅ ×ÄÁÌÏÓÑ (ÚÁÂÁÇÁÔÏ ÓÐÒÏÂ)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3573,36 +3574,36 @@ msgstr ""
 msgid "unknown form field"
 msgstr "ÎÅצÄÏÍÅ ÐÏÌÅ ÆÏÒÍÉ"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÞÉÔÁÎÎÑ."
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "úÁÔ×ÅÒÄÖÕ¤ÍÏ %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "äÕÖÅ ÄÏ×Ǧ ÒÑÄËÉ ÂÕÌÉ ÚÁ×ÅÒÎÕÔ¦!"
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr ""
 
 # @ Gnome-find KDat karchiver karchiver.po kwuftpd lynx red-carpet
 # * Yuri Syrota <rasta@renome.rovno.ua>
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "ÂÁÊÔÉ"
 
@@ -3776,7 +3777,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr ""
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3785,23 +3786,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "îÅÍÏÖÌÉ×Ï Ä¦ÓÔÁÔÉÓÑ ÄÏ ÓËÒÉÐÔÁ cgi"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "çÁÒÎÁ ðÏÒÁÄÁ"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "þÕÄÏ×ÉÊ http ÓÅÒ×ÅÒ ÓÔÏÓÏ×ÎÏ VMS ÄÏÓÔÕÐÎÉÊ ÞÅÒÅÚ"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "ÃÅ ÐÏÓÉÌÁÎÎÑ"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr ""
 
@@ -4040,290 +4041,290 @@ msgstr "ðÏÓÉÌÁÎÎÑ"
 msgid "Visible links"
 msgstr "÷ÉÄÉͦ ÐÏÓÉÌÁÎÎÑ"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ÓÔÁÔÕÓ '%s'."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "×ÉÄÁÌÉÔÉ %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr ""
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr ""
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "ëÁÔÁÌÏÇ Ú ÔÁËÉÍ ¦ÍÅÎÅÍ ÕÖÅ ¦ÓÎÕ¤!  ÷ÉÍÏÇÕ ÐÒϦÇÎÏÒÏ×ÁÎÏ."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "æÁÊÌ ¦Ú ÔÁËÉÍ ¦ÍÅÎÅÍ ÕÖÅ ¦ÓÎÕ¤!  ÷ÉÍÏÇÕ ÐÒϦÇÎÏÒÏ×ÁÎÏ."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "÷ËÁÚÁÎÅ ¦Í'Ñ ×ÖÅ × ÒÏÂÏÔ¦!  ÷ÉÍÏÇÕ ÐÒϦÇÎÏÒÏ×ÁÎÏ."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "÷ÉÄÁÌÉÔÉ ÕÓ¦ ÐÏÚÎÁÞÅΦ ÆÁÊÌÉ ÔÁ ËÁÔÁÌÏÇÉ?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "÷×ÅÄ¦ÔØ ÎÏ׊ͦÓÃÅ ÄÌÑ ÐÏÚÎÁÞÅÎÉÈ ÐÕÎËÔ¦×: "
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "úÁÄÏ×ÇÉÊ ÛÌÑÈ"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr ""
 
 # ôåòí¶îïìïç¶ñ
 # ôåòí¶îïìïç¶ñ
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "÷×ÅÄ¦ÔØ ÎÏ×Å ¦Í'Ñ ÄÌÑ ËÁÔÁÌÏÇÕ: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "÷×ÅÄ¦ÔØ ÎÏ×Å ¦Í'Ñ ÄÌÑ ÆÁÊÌÕ: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "÷×ÅÄ¦ÔØ ÎÏ×ÉÊ ÛÌÑÈ ËÁÔÁÌÏÇÕ: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "÷×ÅÄ¦ÔØ ÎÏ×ÉÊ ÛÌÑÈ ÆÁÊÌÕ: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr ""
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "úͦÎÉÔÉ ÎÁÚ×Õ(n), ÛÌÑÈ(l) ÞÉ ÐÒÁ×Á ÄÏÓÔÕÐÕ(p): "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "úͦÎÉÔÉ ÎÁÚ×Õ(n) ÞÉ ÛÌÑÈ(l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "ãÀ ÍÏÖÌÉצÓÔØ ÝÅ ÎÅ ÒÅÁ̦ÚÏ×ÁÎÏ!"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "÷×ÅÄ¦ÔØ ¦Í'Ñ ÆÁÊÌÕ: "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr ""
 
 # ôåòí¶îïìïç¶ñ
 # ôåòí¶îïìïç¶ñ
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "÷×ÅÄ¦ÔØ ÎÏ×Å ¦Í'Ñ ÄÌÑ ËÁÔÁÌÏÇÕ: "
 
 # ôåòí¶îïìïç¶ñ
 # ôåòí¶îïìïç¶ñ
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "óÔ×ÏÒÉÔÉ ÆÁÊÌ ÞÉ ËÁÔÁÌÏÇ (f ÞÉ d): "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, fuzzy, c-format
 msgid "Remove directory '%s'?"
 msgstr "÷ÉÄÁÌÉÔÉ ÆÁÊÌ '%s'?"
 
 # ôåòí¶îïìïç¶ñ
 # ôåòí¶îïìïç¶ñ
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
 msgstr " ËÁÔÁÌÏÇ"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "÷ÉÄÁÌÉÔÉ ÆÁÊÌ '%s'?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "÷ÉÄÁÌÉÔÉ ÆÁÊÌ?"
 
 # 8-| ÎÅ ÚÎÁÀ...
 # 8-| ÎÅ ÚÎÁÀ...
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "÷ÉÄÁÌÉÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ '%s'?"
 
 # 8-| ÎÅ ÚÎÁÀ...
 # 8-| ÎÅ ÚÎÁÀ...
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "÷ÉÄÁÌÉÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr ""
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr ""
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "÷ËÁÖ¦ÔØ ÐÒÁ×Á ÄÏÓÔÕÐÕ:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "÷ÌÁÓÎÉË:"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "çÒÕÐÁ"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "¶ÎÛ¦:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "îÅצÒÎÉÊ ÆÏÒÍÁÔ ÒÅÖÉÍÕ."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "îÅצÒÎÉÊ ÆÏÒÍÁÔ ÓÉÎÔÁËÓÉÓÕ."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr ""
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr ""
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "÷ÉËÏÎÕÀ %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "÷ÉËÏÎÕÀ ÓÉÓÔÅÍÎÕ ËÏÍÁÎÄÕ. ãÅ ÍÏÖÅ ÚÁÊÎÑÔÉ ÔÒÏÈÉ ÞÁÓÕ."
 
 # ôåòí¶îïìïç¶ñ
 # ôåòí¶îïìïç¶ñ
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "÷ÉĦÌÅÎÉÊ ÅÌÅÍÅÎÔ:"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "î¦ÞÏÇÏ ÎÅ ×ÉĦÌÅÎÏ"
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "צÄͦÞÅÎÉÊ ÅÌÅÍÅÎÔ:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "צÄͦÞÅΦ ÅÌÅÍÅÎÔÉ:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "îÅצÒÎÅ ¦Í'Ñ ÆÁÊÌÕ, ÚÁÐÉÔ ×¦ÄÈÉÌÅÎÏ."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr ""
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr ""
 
 # msgstr "è×ÉÌÉÎÏÞËÕ, ..."
 # msgstr "è×ÉÌÉÎÏÞËÕ, ..."
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "úÁÞÅËÁÊÔÅ È×ÉÌØËÕ, ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr ""
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr ""
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr ""
 
 # msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ ×ÉËÏÎÁÎÏ"
 # msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ ×ÉËÏÎÁÎÏ"
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "¶ÎÓÔÁÌÑæÀ ÚÁ×ÅÒÛÅÎÏ"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr ""
 
@@ -4363,22 +4364,22 @@ msgstr "ãÅ ÐÏצÄÏÍÌÅÎÎÑ ÚÇÅÎÅÒÏ×ÁÎÏ Á×ÔÏÍÁÔÉÞÎÏ ÍÎÏÀ,"
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "äÁÒÕÊÔÅ, Winsock ÎÅ ÚÎÁÊÄÅÎÏ."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 #, fuzzy
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "÷É íõóéôå ×ËÁÚÁÔÉ TMP ÞÉ TEMP!\n"
 
 # ôåòí¶îïìïç¶ñ
 # msgstr "îÅÍÁ¤ ÔÁËÏÇÏ ËÁÔÁÌÏÇÕ"
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "ôÁËÏÇÏ ËÁÔÁÌÏÇÕ ÎÅÍÁ¤"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4389,7 +4390,7 @@ msgstr ""
 "æÁÊÌ ËÏÎÆ¦ÇÕÒÁÃ¦Ê %s ÎÅÄÏÓÔÕÐÎÉÊ.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4397,7 +4398,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4405,7 +4406,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4416,70 +4417,70 @@ msgstr ""
 "æÁÊÌ Lynx %s ÎÅÄÏÓÔÕÐÎÉÊ.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "õ×ÁÇÁ:"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s ÷ÅÒÓ¦Ñ %s (%s)\n"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "ú¦ÂÒÁÎÏ ÎÁ %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr ""
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "òÏÚÐÏ×ÓÀÄÖÕ¤ÔØÓÑ ÚǦÄÎÏ Ú GNU General Public License.\n"
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 #, fuzzy
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 "äÉ× http://lynx.browser.org/ ÔÁ ÏÎÌÁÊÎ-ÄÏÐÏÍÏÇÕ, ÝÏ ×ÚÎÁÔÉ Â¦ÌØÛÅ.\n"
 "\n"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "÷éëïòéóôáîîñ: %s [ÐÁÒÁÍÅÔÒÉ] [ÆÁÊÌ]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "ðÁÒÁÍÅÔÒÉ:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: îÅצÒÎÉÊ ÐÁÒÁÍÅÔÒ: %s\n"
@@ -4508,7 +4509,7 @@ msgstr "åËÒÁÎ äÏÐÏÍÏÇÉ"
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr ""
 
@@ -4532,68 +4533,68 @@ msgstr ""
 msgid "failed to change directory"
 msgstr "îÅ ÍÏÖÕ Ä¦ÓÔÁÔÉÓÑ ÄÏ ËÁÔÁÌÏÇÕ."
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "ïÐÒÁÃØÏ×Õ¤ÍÏ ÄÏËÕÍÅÎÔ ÚǦÄÎÏ Ú ÐÏÔÏÞÎÉÍÉ ÕÓÔÁÎÏ×ËÁÍÉ..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "æÁÔÁÌØÎÁ ÐÏÍÉÌËÁ - ÎÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ×ÉȦÄÎÉÊ ÆÁÊÌ %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
 # ôåòí¶îïìïç¶ñ
 # ôåòí¶îïìïç¶ñ
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 #, fuzzy
 msgid "Current URL is empty."
 msgstr "ðÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ:"
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-¦ÎÄÅËÓ-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: îÅÍÏÖÌÉ×Ï ÚÁ×ÁÎÔÁÖÉÔÉ ÓÔÁÒÔÏ×ÉÊ ÆÁÊÌ"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: óÔÁÒÔÏ×ÏÇÏ ÆÁÊÌÕ ÎÅÍÁ, ÞÉ ×¦Î ÎÅ Õ ÆÏÒÍÁÔ¦ text/html (text/plain)"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "     ÷ÉÈÏÄÉÍÏ..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-ÄÁ̦-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "÷É ÎÁÄÓÉÌÁ¤ÔÅ ÌÉÓÔÁ ÄÏ:"
 
@@ -4601,7 +4602,7 @@ msgstr "÷É ÎÁÄÓÉÌÁ¤ÔÅ ÌÉÓÔÁ ÄÏ:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4615,7 +4616,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4625,7 +4626,7 @@ msgstr ""
 "\n"
 " âÕÄØ ÌÁÓËÁ, ×ËÁÖ¦ÔØ ÞÉ ×¦ÄÒÅÄÁÇÕÊÔÅ ÚÁÇÏÌÏ×ÏË \"ôÅÍÁ:\"\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4638,7 +4639,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4648,7 +4649,7 @@ msgstr ""
 "\n"
 " âÕÄØ ÌÁÓËÁ, ××ÅÄ¦ÔØ ×ÁÛÅ ÐÏצÄÏÍÌÅÎÎÑ ÎÉÖÞÅ."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr ""
 
@@ -5349,38 +5350,38 @@ msgstr ""
 msgid "(no name)"
 msgstr "(ÎÅÍÁ ¦ÍÅΦ)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "×ËÌÀÞÅÎÏÍÕ Ú '%s'.\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "ïÓØ ÔÁËÅ ÂÕÌÏ ÚÎÁÊÄÅÎÏ Õ ×ÁÛÏÍÕ ÆÁÊ̦ lynx.cfg."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "ú×ÅÒÎ¦ÔØÓÑ ÄÏ ÄÉÓÔÒÉÂÕÔÉ×Á"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "ÐÏ ÄÏÄÁÔËÏ×Õ ¦ÎÆÏÒÍÁæÀ."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "ðåòåþéôáôé"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "÷ÁÛÁ ÏÓÎÏ×ÎÁ ËÏÎÆ¦ÇÕÒÁæÑ"
 
@@ -5420,31 +5421,31 @@ msgstr ""
 msgid "Full name:"
 msgstr "ðÏ×ÎÅ ¦Í'Ñ:"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr ""
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr ""
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "      ÷ÌÁÓÎÉË:"
 
 # @ evolution kuser lynx
 # * Andriy Rysin <arysin@yahoo.com>
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "îÁÚ×Á ÇÒÕÐÉ:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "òÏÚÍ¦Ò ÆÁÊÌÕ:"
 
 # @ Gnome-find KDat karchiver karchiver.po kwuftpd lynx red-carpet
 # * Yuri Syrota <rasta@renome.rovno.ua>
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 #, fuzzy
 msgid "(bytes)"
 msgstr "ÂÁÊÔÉ"
@@ -5452,168 +5453,168 @@ msgstr "ÂÁÊÔÉ"
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "     óÔ×ÏÒÅÎÏ:"
 
 # @ KDat lynx
 # * Andriy Rysin <arysin@yahoo.com>
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "ïÓÔÁÎÎÑ ÍÏÄÉÆ¦ËÁæÑ:"
 
 # @ KDat lynx
 # * Andriy Rysin <arysin@yahoo.com>
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "ïÓÔÁÎΤ Ú×ÅÒÎÅÎÎÑ:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "ðÒÁ×Á ÄÏÓÔÕÐÕ"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 #, fuzzy
 msgid "Group:"
 msgstr "çÒÕÐÁ"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "æÁÊÌ, ÑËÉÊ ×É ÚÁÒÁÚ ÐÅÒÅÇÌÑÄÁ¤ÔÅ"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr ""
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "îÁÂ¦Ò ÓÉÍ×Ï̦×:"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "óÅÒ×ÅÒ:"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "äÁÔÁ:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr ""
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr ""
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr ""
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "äÏ×ÖÉÎÁ ×ͦÓÔÕ:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 #, fuzzy
 msgid "Length:"
 msgstr "äÏ×ÖÉÎÁ ×ͦÓÔÕ:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "íÏ×Á:"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr ""
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr ""
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "÷ÌÁÓÎÉË(É):"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "ÒÏÚͦÒ:"
 
 # @ Galeon- lynx xfce
 # * Andriy Rysin <arysin@yahoo.com>
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "ÒÑÄËÉ"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr ""
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "ÄÖÅÒÅÌÏ"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "Ú×ÉÞÁÊÎÉÊ"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ""
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ""
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ""
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ""
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", ÆÁÊÌ ÚÁËÌÁÄÉÎÏË"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "ÒÅÖÉÍ:"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "ðÏÓÉÌÁÎÎÑ, ÑËÉÊ ÚÁÒÁÚ ×ÉĦÌÅÎÏ"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "íÅÔÏÄ:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr ""
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 #, fuzzy
 msgid "Action:"
 msgstr "òÏÚͦÝÅÎÎÑ: "
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(ðÏÌÅ ÆÏÒÍÉ)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "îÁ Ã¦Ê ÓÔÏÒ¦Îæ ÎÅÍÁ¤ ÐÏÓÉÌÁÎØ"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 #, fuzzy
 msgid "Server Headers:"
 msgstr "óÅÒ×ÅÒ:"
@@ -5661,33 +5662,33 @@ msgstr "÷¦Ä×ÁÎÔÁÖÉÔÉ ÄÏ:"
 msgid "Upload options:"
 msgstr "ðÁÒÁÍÅÔÒÉ ×¦Ä×ÁÎÔÁÖÅÎÎÑ:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "ÎÅצÄÏÍÅ ÏÂÍÅÖÅÎÎÑ"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "ïÂÍÅÖÅÎÎÑ ×¦ÄÓÕÔΦ.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "îÁÂ¦Ò ÏÂÍÅÖÅÎØ:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "îÅ ÍÏÖÕ ÚÎÁÊÔÉ ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ"
 
diff --git a/po/vi.po b/po/vi.po
index 50330081..1e9620ac 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.7-dev9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\n"
 "PO-Revision-Date: 2008-07-12 17:01+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -2159,7 +2159,7 @@ msgstr ""
 " Hãy nhập thông điệp bên dưới."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2168,7 +2168,7 @@ msgstr ""
 " Khi hoàn thành, bấm Enter và gõ một dấu chấm (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2805,7 +2805,7 @@ msgstr "Không tìm thấy tài liệu vá»›i ná»™i dung POST trong bá»™ nhá»› tá
 msgid "Loading failed, use a previous copy."
 msgstr "Nạp không thành công, hãy sử dụng bản sao trước đây."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "Chưa nạp xong."
 
@@ -2828,7 +2828,7 @@ msgstr "**** HTAccess: Trạng thái trả lại là: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "Không thể truy cập"
 
@@ -3033,7 +3033,7 @@ msgstr "Äịa chỉ có cổng không hợp lệ"
 msgid "Address length looks invalid"
 msgstr "Chiá»u dài địa chỉ hình như không hợp lệ"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Không thể định vị máy từ xa %s."
@@ -3042,40 +3042,41 @@ msgstr "Không thể định vị máy từ xa %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Tên máy không hợp lệ %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Äang tạo kết nối %s tá»›i %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr "lỗi ổ cắm."
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "lỗi ổ cắm: nhóm %d địa chỉ %s cổng %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr "Không thể làm cho kết nối không chặn."
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "Lá»—i kết nối (quá nhiá»u lần thá»­ lại)."
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr "Không thể phục hồi ổ cắm để chặn."
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr "Äá»c ổ cắm không thành công 180 000 lần."
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "Lá»—i kết nối (quá nhiá»u lần thá»­ lại)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3490,34 +3491,34 @@ msgstr "trưá»ng keygen"
 msgid "unknown form field"
 msgstr "trưá»ng biểu mẫu không rõ"
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "không thể mở tập tin để tải lên"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr "Äang gá»­i %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Tìm ra Treo: cấu trúc TextAnchor bị lỗi - đỠnghị thoát."
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ngắt dòng để vừa khít vùng hiển thị ?"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr "Các dòng rất dài đã bị ngắt."
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr "Các dòng rất dài đã bị cắt ngắn."
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "byte"
 
@@ -3688,7 +3689,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Có thể phục hồi tập tin từ %s trong phiên chạy này"
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Bạn có muốn thực hiện « %s » không?"
@@ -3697,23 +3698,23 @@ msgstr "Bạn có muốn thực hiện « %s » không?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Không thể truy cập đến văn lệnh CGI"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "Gợi ý"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr "Một máy phục vụ HTTP tuyệt với cho VMS có tại"
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr "liên kết này"
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Nó cung cấp hỗ trợ tiên tiến nhất của văn lệnh CGI.\n"
 
@@ -3945,271 +3946,271 @@ msgstr "Tham chiếu"
 msgid "Visible links"
 msgstr "Liên kết hiển thị"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "Không thể lấy trạng thái vỠ« %s »."
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Bạn đã chá»n má»™t mục không phải là tập tin hoặc thư mục. Yêu cầu bị bá» qua."
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Không thể %s do lỗi hệ thống."
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "%s rất có thể thất bại do lỗi hệ thống."
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "bá» %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr "sá» %s"
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "chuyển %s vào %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Äã có má»™t thư mục tên đó. Yêu cầu bị bá» qua."
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Äã có má»™t tập tin tên đó. Yêu cầu bị bá» qua."
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Bạn đã ghi rõ một tên đang được dùng. Yêu cầu bị bỠqua."
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "Äích đến có chá»§ sở hữu khác!  Yêu cầu bị bá» qua."
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Äích đến không phải là thư mục hợp lệ. Yêu cầu bị bá» qua."
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "Gỡ bỠtất cả các tập tin và thư mục có thẻ ?"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "Nhập vị trí mới cho các mục có thẻ:"
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "ÄÆ°á»ng dẫn quá dài"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "Nguồn và đích là cùng một vị trí — yêu cầu bị bỠqua."
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "Nhập tên mới cho thư mục: "
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "Nhập tên mới cho tập tin: "
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Gặp ký tá»± (dấu tách đưá»ng dẫn) không cho phép! Yêu cầu bị bá» qua."
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "Nhập vị trí mới cho thư mục: "
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "Nhập vị trí mới cho tập tin: "
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Lá»—i không mong đợi - không tìm thấy dấu tách đưá»ng dẫn theo sau"
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Nguồn và đích là cùng một vị trí. Yêu cầu bị bỠqua."
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Sá»­a [N] tên, [L] vị trí, hoặc [P] quyá»n hạn: "
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "Sửa [N] tên hoặc [L] vị trí: "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "Tính năng này vẫn không được thực thi hoàn toàn."
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "Hãy nhập tên của tập tin cần tạo : "
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Sự chuyển hướng « // » không cho phép. Yêu cầu bị bỠqua."
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "Nhập tên cho thư mục mới: "
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "Tạo [F] tập tin hoặc [D] thư mục: "
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Gỡ bỠthư mục « %s » không?"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 msgid "Remove directory?"
 msgstr "Gỡ bỠthư mục không?"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Gỡ bỠtập tin « %s » không?"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "Gỡ bỠtập tin không?"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Gỡ bỠliên kết tượng trưng « %s » không?"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "Gỡ bỠliên kết tượng trưng không?"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Tiếc là chưa biết cho phép tập tin khác UNIX như thể nào."
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr "Không thể mở tập tin tùy chá»n cho phép"
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "Hãy đặt quyá»n hạn bên dưới:"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "Chá»§ :"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "Nhóm"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "Khác:"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr "biểu mẫu để cho phép"
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr "Äịnh dạng chế độ không hợp lệ."
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "Äịnh dạng cú pháp không hợp lệ."
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Cảnh báo !  Tập tin đã giải nén UUDecode sẽ nằm trong thư mục đã chạy Lynx."
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr "Cái chỉ URL RỖNG"
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "Äang thá»±c hiện %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "Äang thá»±c hiện câu lệnh hệ thống. Có thể hÆ¡i lâu."
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "Thư mục hiện tại:"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "Vùng chá»n hiện có :"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "Chưa chá»n gì."
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "mục có thẻ:"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "mục có thẻ:"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "Tên tập tin cấm: yêu cầu bị bỠqua."
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr "Không cho phép cài đặt vào thư mục đã chá»n."
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Bạn đã chá»n má»™t mục không phải là thư mục. Yêu cầu bị bá» qua."
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "ChỠmột giây, ..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr "Gặp lỗi khi xây dựng các đối số cài đặt"
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Nguồn và đích là trùng: %s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Äã có trong thư mục đích: %s"
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "Cài đặt hoàn tất"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr "URL tạm thá»i hoặc danh sách quá dài."
 
@@ -4248,19 +4249,19 @@ msgstr "Thông điệp này đã tự động được tạo bởi"
 msgid "No system mailer configured"
 msgstr "Chưa cấu hình trình thư cho hệ thống"
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "Tiếc là không tìm thấy Winsock."
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "PHẢI chỉ ra má»™t vùng TMP hoặc TEMP (tạm thá»i)."
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "Không có thư mục nào như vậy"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4271,7 +4272,7 @@ msgstr ""
 "Tập tin cấu hình « %s » không sẵn sàng.\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4281,7 +4282,7 @@ msgstr ""
 "\n"
 "Chưa khai báo bộ ký tự Lynx.\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4292,7 +4293,7 @@ msgstr ""
 "Chưa khai báo sơ đồ soạn thảo Lynx.\n"
 "\n"
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4303,66 +4304,66 @@ msgstr ""
 "Tập tin Lynx « %s » không sẵn sàng.\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Äã bá» qua %d ký tá»± từ đầu vào tiêu chuẩn.\n"
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Dùng cỠ« -stdin » hay « - » để báo nên xử lý dữ liệu nhập qua ống dẫn như thế nào.\n"
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "Cảnh báo :"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr "trạng thái bá»n bỉ cá»§a cookie sẽ chỉ thay đổi trong phiên chạy tiếp theo."
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: đang bỠqua « charset=%s » (bộ ký tự) không nhận ra\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Phiên bản %s (%s)"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Xây dựng trên %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Äăng ký bản quyá»n bởi Nhóm Nhà Phát Triển Lynx,"
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Äại há»c Kansas, CERN, và những nhà đóng góp khác."
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "ÄÆ°á»£c phát hành vá»›i Ä‘iá»u kiện cá»§a Giấy Phép Công Cá»™ng GNU (GPL) phiên bản 2."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Xin hãy ghé thăm « http://lynx.isc.org/ » và trợ giúp trực tuyến để xem thêm thông tin chi tiết."
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Sá»­ dụng: %s [tùy_chá»n] [tập_tin]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "Tùy chá»n:\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Tùy chá»n không hợp lệ: %s\n"
@@ -4391,7 +4392,7 @@ msgstr "Màn hình Trợ giúp"
 msgid "System Index"
 msgstr "Chỉ mục Hệ thống"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr "Vào màn hình chính"
 
@@ -4415,65 +4416,65 @@ msgstr "Má»™t thành phần cá»§a đưá»ng dẫn không phải là thư mục"
 msgid "failed to change directory"
 msgstr "lỗi chuyển đổi thư mục"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "Äang phân tích lại tài liệu vá»›i thiết lập hiện thá»i..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Lỗi nghiêm trong — không thể mở tập tin kết xuất %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr "BẢNG ở giữa bật."
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr "BẢNG ở giữa tắt."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr "Äịa chỉ URI hiện thá»i còn rá»—ng."
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Lỗi sao chép vào bảng nháp."
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr "Äịa chỉ URL cá»§a tài liệu được chuyển vào bảng nháp."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr "Äịa chỉ URL cá»§a liên kết được chuyển vào bảng nháp."
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr "Không có địa chỉ URL trên bảng nháp."
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "-chỉ mục-"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx: không thể truy cập đến tập tin bắt đầu (startfile)"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Không tìm thấy tập tin bắt đầu hoặc không phải là text/html (văn bản/HTML) hay text/plain (văn bản thô)"
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      Äang thoát..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "-thêm-"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr "Bạn sẽ gửi tới:"
 
@@ -4481,7 +4482,7 @@ msgstr "Bạn sẽ gửi tới:"
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4495,7 +4496,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4505,7 +4506,7 @@ msgstr ""
 "\n"
 " Xin hãy thêm hoặc sá»­a dòng đầu Chá»§ Ä‘á»: (Subject)\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4518,7 +4519,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4528,7 +4529,7 @@ msgstr ""
 "\n"
 "Hãy gõ thư bên dưới."
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr "Thư không có văn bản gốc."
 
@@ -5184,38 +5185,38 @@ msgstr "Lynx: không khởi chạy được, không có sẵn tập tin quy tắ
 msgid "(no name)"
 msgstr "(không tên)"
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Có nhiá»u hÆ¡n %d phần bao gồm lynx.cfg lồng vào nhau — có thể là vòng lặp ?!?\n"
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Lần thử thêm bao gồm cuối cùng là « %s »,\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "bao gồm từ « %s ».\n"
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "Những cái sau Ä‘á»c từ tập tin lynx.cfg."
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr "Hãy Ä‘á»c bản phân phối"
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr "để tìm thêm bình luận."
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "NẠP LẠI THAY Äá»”I"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "Cấu hình chính"
 
@@ -5251,187 +5252,187 @@ msgstr "Mục được chá»n hiện thá»i"
 msgid "Full name:"
 msgstr "Tên đầy đủ :"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr "Không thể theo liên kết"
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr "Chỉ tới tập tin:"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "Tên của chủ :"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "Tên nhóm:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Kích cỡ tập tin:"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr "(byte)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "Ngày tạo :"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "Sửa cuối:"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "Truy cập cuối:"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "Quyá»n truy cập"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr "Nhóm:"
 
 # File access context — Ngữ cảnh truy cập đến tập tin
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr "Má»i ngưá»i:"
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "Tập tin đang xem"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Tên liên kết:"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "Bộ ký tự :"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr "(giả sử)"
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "Máy phục vụ :"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "Ngày:"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "Sửa cuối:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr "Hết hạn:"
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr "Äiá»u khiển bá»™ nhá»› tạm:"
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr "BỠdài nội dung:"
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr "BỠdài:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "Ngôn ngữ :"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr "Gửi dữ liệu :"
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr "Gửi kiểu nội dung:"
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "Chá»§ :"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "kích cỡ :"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "dòng"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr "chế độ biểu mẫu"
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr "nguồn"
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr "chuẩn"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ", an toàn"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ", qua liên kết nội bộ"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ", không nhớ tạm"
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ", văn lệnh ISMAP"
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ", tập tin Äánh dấu"
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "chế độ :"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "Liên kết được chá»n hiện thá»i"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr "Phương pháp:"
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "Kiểu bảng mã:"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr "Hành vi:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr "(Trưá»ng biểu mẫu)"
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "Không có liên kết trên trang hiện thá»i"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr "Dòng đầu máy phục vụ :"
 
@@ -5496,33 +5497,33 @@ msgstr "Tải lên:"
 msgid "Upload options:"
 msgstr "Tùy chá»n tải lên:"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr "Tải vỠđịa chỉ URL của tài liệu nằm trên bảng nháp."
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Giao thức truy cập không mong đợi cho lược đồ địa chỉ URL này."
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "Quá nhiá»u tập tin tạm thá»i"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr "không rõ sự hạn chế"
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Chưa đặt sự hạn chế.\n"
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Äã đắt sá»± hạn chế:\n"
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "Không tìm thấy thư mục HOME"
 
@@ -6129,3 +6130,6 @@ msgstr ""
 "đã được cảnh báo trước...\n"
 "Tập tin cấu hình chung thưá»ng gá»i là lynx.cfg, nó có ná»™i dung\n"
 "cÅ©ng như định dạng khác. Äây không phải là tập tin như vậy.\n"
+
+#~ msgid "Socket read failed for 180,000 tries."
+#~ msgstr "Äá»c ổ cắm không thành công 180 000 lần."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c8c8b46a..d64beb81 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: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\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"
@@ -2129,14 +2129,14 @@ msgid ""
 msgstr ""
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
 msgstr ""
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2754,7 +2754,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr ""
 
@@ -2777,7 +2777,7 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr ""
 
@@ -2975,7 +2975,7 @@ msgstr ""
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -2984,39 +2984,39 @@ msgstr ""
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
+#: WWW/Library/Implementation/HTTCP.c:2016
+msgid "Socket read failed (too many tries)."
 msgstr ""
 
 #: WWW/Library/Implementation/HTTP.c:84
@@ -3422,34 +3422,34 @@ msgstr ""
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr ""
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr ""
 
@@ -3608,7 +3608,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr ""
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3617,23 +3617,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr ""
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr ""
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr ""
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr ""
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr ""
 
@@ -3858,272 +3858,272 @@ msgstr ""
 msgid "Visible links"
 msgstr ""
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr ""
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr ""
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr ""
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr ""
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr ""
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr ""
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr ""
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr ""
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr ""
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr ""
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr ""
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr ""
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr ""
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr ""
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr ""
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr ""
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr ""
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr ""
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr ""
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr ""
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr ""
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
 msgstr "正在读å–目录……"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr ""
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr ""
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr ""
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr ""
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr ""
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr ""
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr ""
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr ""
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr ""
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr ""
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr ""
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr ""
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr ""
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr ""
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr ""
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr ""
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr ""
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr ""
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr ""
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr ""
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr ""
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr ""
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr ""
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr ""
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr ""
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr ""
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr ""
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr ""
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr ""
 
@@ -4162,19 +4162,19 @@ msgstr ""
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr ""
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr ""
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr ""
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4182,7 +4182,7 @@ msgid ""
 "\n"
 msgstr "当剿²¡æœ‰è·³è½¬æ–‡ä»¶ã€‚"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4190,7 +4190,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4198,7 +4198,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4206,66 +4206,66 @@ msgid ""
 "\n"
 msgstr "当剿²¡æœ‰è·³è½¬æ–‡ä»¶ã€‚"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr ""
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr ""
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr ""
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr ""
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr ""
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
@@ -4294,7 +4294,7 @@ msgstr ""
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr ""
 
@@ -4318,65 +4318,65 @@ msgstr ""
 msgid "failed to change directory"
 msgstr ""
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 msgid "Current URL is empty."
 msgstr ""
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr ""
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr ""
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr ""
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr ""
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr ""
 
@@ -4384,7 +4384,7 @@ msgstr ""
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4395,14 +4395,14 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
 " Please provide or edit the Subject: header\n"
 msgstr ""
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4412,14 +4412,14 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
 " Please enter your message below."
 msgstr ""
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr ""
 
@@ -5065,38 +5065,38 @@ msgstr ""
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr ""
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr ""
 
@@ -5132,186 +5132,186 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr ""
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr ""
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr ""
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr ""
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr ""
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 msgid "(bytes)"
 msgstr ""
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr ""
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr ""
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr ""
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr ""
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 msgid "Group:"
 msgstr ""
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr ""
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr ""
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr ""
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr ""
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr ""
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr ""
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr ""
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr ""
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr ""
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr ""
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr ""
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr ""
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr ""
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr ""
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr ""
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr ""
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr ""
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ""
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ""
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ""
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ""
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ""
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr ""
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr ""
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr ""
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr ""
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 msgid "Action:"
 msgstr ""
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr ""
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr ""
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 msgid "Server Headers:"
 msgstr ""
 
@@ -5358,33 +5358,33 @@ msgstr ""
 msgid "Upload options:"
 msgstr ""
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr ""
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr ""
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3c68a9c1..fd16db3a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx 2.8.5pre9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-21 16:20-0400\n"
+"POT-Creation-Date: 2008-12-07 20:02-0500\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"
@@ -2143,7 +2143,7 @@ msgstr ""
 " ½Ð¦b¥H¤Uªº¦a¤è¿é¤J°T®§¡C"
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:691 src/LYNews.c:357
+#: LYMessages.c:691 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2152,7 +2152,7 @@ msgstr ""
 " §¹¦¨«á½Ð«ö enter¡AµM«á¦b¤U¤@¦æ"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:693 src/LYNews.c:358
+#: LYMessages.c:693 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2780,7 +2780,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8587
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
 msgstr "¥¼§¹¦¨¸ü¤J¤º®e¡C"
 
@@ -2803,7 +2803,7 @@ msgstr "**** HTAccess¡G¦^¶Çªºª¬ºA¬°¡G%d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7783
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
 msgstr "µLªk¦s¨ú"
 
@@ -3003,7 +3003,7 @@ msgstr "¦a§}¤¤ªº³s±µ°ðµL®Ä"
 msgid "Address length looks invalid"
 msgstr "¦a§}ªø«×¦ü¥GµL®Ä"
 
-#: WWW/Library/Implementation/HTTCP.c:1607 WWW/Library/Implementation/HTTCP.c:1625
+#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "§ä¤£¨ì»·ºÝ¥D¾÷ %s¡C"
@@ -3012,40 +3012,41 @@ msgstr "§ä¤£¨ì»·ºÝ¥D¾÷ %s¡C"
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1622 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "µL®Äªº¥D¾÷¦WºÙ %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "¥¿¦b«Ø¥ß %s ³s½u¡A³s¦Ü %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1647
+#: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1660
+#: WWW/Library/Implementation/HTTCP.c:1671
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1684
+#: WWW/Library/Implementation/HTTCP.c:1695
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1752
+#: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
 msgstr "³s½u¥¢±Ñ (­«¸Õ¦¸¼Æ¤Ó¦h)¡C"
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2011
-msgid "Socket read failed for 180,000 tries."
-msgstr ""
+#: WWW/Library/Implementation/HTTCP.c:2016
+#, fuzzy
+msgid "Socket read failed (too many tries)."
+msgstr "³s½u¥¢±Ñ (­«¸Õ¦¸¼Æ¤Ó¦h)¡C"
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3451,34 +3452,34 @@ msgstr ""
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:10320
+#: src/GridText.c:10279
 msgid "Can't open file for uploading"
 msgstr "µLªk¶}±Ò·Ç³Æ¤W¶ÇªºÀÉ®×"
 
-#: src/GridText.c:11479
+#: src/GridText.c:11438
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12532
+#: src/GridText.c:12491
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:12669
+#: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
 msgstr "¬O§_¶i¦æ¦Û°Ê´«¦æ¨Ó²Å¦Xµe­±¤Ø¤o¡H"
 
-#: src/GridText.c:12721
+#: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
 msgstr ""
 
-#: src/GridText.c:13226
+#: src/GridText.c:13185
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:359 src/LYShowInfo.c:363
+#: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
 msgstr "¦ì¤¸²Õ"
 
@@ -3643,7 +3644,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr ""
 
-#: src/LYCgi.c:159
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr ""
@@ -3652,23 +3653,23 @@ msgstr ""
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:274
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "µLªk¦s¨ú cgi script¡C"
 
-#: src/LYCgi.c:699 src/LYCgi.c:702
+#: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
 msgstr "«ØÄ³"
 
-#: src/LYCgi.c:706
+#: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
 msgstr ""
 
-#: src/LYCgi.c:713
+#: src/LYCgi.c:715
 msgid "this link"
 msgstr ""
 
-#: src/LYCgi.c:717
+#: src/LYCgi.c:719
 msgid "It provides state of the art CGI script support.\n"
 msgstr ""
 
@@ -3900,272 +3901,272 @@ msgstr ""
 msgid "Visible links"
 msgstr "¤£ÁôÂêºÃìµ²"
 
-#: src/LYLocal.c:269
+#: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
 msgstr "µLªkÀò¨ú¡¥%s¡¦ªºª¬ºA¡C"
 
-#: src/LYLocal.c:303
+#: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "¿ï¨úªº¶µ¥Ø¤£¬OÀɮשΥؿý¡I©¿²¤¸Ó­n¨D¡C"
 
-#: src/LYLocal.c:371
+#: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "¦]¬°¨t²Î¿ù»~¦ÓµLªk%s¡I"
 
-#: src/LYLocal.c:405
+#: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "¥i¯à¦]¬°¨t²Î¿ù»~¦ÓµLªk%s¡I"
 
-#: src/LYLocal.c:467 src/LYLocal.c:488
+#: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
 msgstr "²¾°£ %s"
 
-#: src/LYLocal.c:506
+#: src/LYLocal.c:508
 #, c-format
 msgid "touch %s"
 msgstr ""
 
-#: src/LYLocal.c:534
+#: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
 msgstr "±N %s ²¾°Ê¦Ü %s"
 
-#: src/LYLocal.c:575
+#: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "¦P¤@¦WºÙªº¥Ø¿ý¤w¸g¦s¦b¡I©¿²¤¸Ó­n¨D¡C"
 
-#: src/LYLocal.c:577
+#: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
 msgstr "¦P¤@¦WºÙªºÀɮפw¸g¦s¦b¡I©¿²¤¸Ó­n¨D¡C"
 
-#: src/LYLocal.c:579
+#: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
 msgstr "«ü©wªºÀɮפw¦b¨Ï¥Î¤¤¡I©¿²¤¸Ó­n¨D¡C"
 
-#: src/LYLocal.c:590
+#: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
 msgstr "¥Øªº¦aªº¾Ö¦³ªÌ¤£¦P¡I©Úµ´¸Ó­n¨D¡C"
 
-#: src/LYLocal.c:593
+#: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "¥Øªº¦a¤£¬O¦³®Äªº¥Ø¿ý¡I©Úµ´¸Ó­n¨D¡C"
 
-#: src/LYLocal.c:615
+#: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
 msgstr "½T©w²¾°£©Ò¦³¥[¤W¼Ð°OªºÀɮפΥؿý¡H"
 
-#: src/LYLocal.c:673
+#: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
 msgstr "¿é¤J¥[¤W¼Ð°Oªº¶µ¥Øªº·s¦ì¸m¡G"
 
-#: src/LYLocal.c:743
+#: src/LYLocal.c:745
 msgid "Path too long"
 msgstr "¸ô®|¹Lªø"
 
-#: src/LYLocal.c:774
+#: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
 msgstr "¨Ó·½¤Î¥Øªº¦a¦ì¸m¬Û¦P ¢w ©¿²¤¸Ó­n¨D¡I"
 
-#: src/LYLocal.c:831
+#: src/LYLocal.c:833
 msgid "Enter new name for directory: "
 msgstr "¿é¤J¥Ø¿ýªº·s¦WºÙ¡G"
 
-#: src/LYLocal.c:833
+#: src/LYLocal.c:835
 msgid "Enter new name for file: "
 msgstr "¿é¤JÀɮתº·s¦WºÙ¡G"
 
-#: src/LYLocal.c:845
+#: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "¥X²{¤£¦Xªkªº¦r¤¸ (¸ô®|¤À¹j¦r¤¸)¡I©¿²¤¸Ó­n¨D¡C"
 
-#: src/LYLocal.c:895
+#: src/LYLocal.c:897
 msgid "Enter new location for directory: "
 msgstr "¿é¤J¥Ø¿ýªº·s¦ì¸m¡G"
 
-#: src/LYLocal.c:901
+#: src/LYLocal.c:903
 msgid "Enter new location for file: "
 msgstr "¿é¤JÀɮתº·s¦ì¸m¡G"
 
-#: src/LYLocal.c:928
+#: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr ""
 
-#: src/LYLocal.c:948
+#: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "¨Ó·½¤Î¥Øªº¦a¦ì¸m¬Û¦P¡I©¿²¤¸Ó­n¨D¡I"
 
-#: src/LYLocal.c:995
+#: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "­×§ï¦WºÙ¡B¦ì¸m©ÎÅv­­ (n¡Bl ©Î p)¡G"
 
-#: src/LYLocal.c:997
+#: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
 msgstr "­×§ï¦WºÙ©Î¦ì¸m (n ©Î l)¡G"
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1026
+#: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
 msgstr "¦¹¥\¯à¤´¥¼§¹¦¨¡I"
 
-#: src/LYLocal.c:1046
+#: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
 msgstr "¿é¤J·Ç³Æ«Ø¥ßªºÀɮצWºÙ¡G"
 
-#: src/LYLocal.c:1050 src/LYLocal.c:1086
+#: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "¥X²{¤£¦Xªkªº­«·s¾É¦V \"//\"¡I©¿²¤¸Ó­n¨D¡C"
 
-#: src/LYLocal.c:1082
+#: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
 msgstr "¿é¤J·s¥Ø¿ýªº¦WºÙ¡G"
 
-#: src/LYLocal.c:1122
+#: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
 msgstr "«Ø¥ßÀɮשΥؿý (f ©Î d)¡G"
 
-#: src/LYLocal.c:1164
+#: src/LYLocal.c:1166
 #, fuzzy, c-format
 msgid "Remove directory '%s'?"
 msgstr "¬O§_²¾°£Àɮס¥%s¡¦¡H"
 
-#: src/LYLocal.c:1167
+#: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
 msgstr " ¥Ø¿ý"
 
-#: src/LYLocal.c:1172
+#: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "¬O§_²¾°£Àɮס¥%s¡¦¡H"
 
-#: src/LYLocal.c:1174
+#: src/LYLocal.c:1176
 msgid "Remove file?"
 msgstr "¬O§_²¾°£ÀɮסH"
 
-#: src/LYLocal.c:1179
+#: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "¬O§_²¾°£²Å¸¹³sµ²¡¥%s¡¦¡H"
 
-#: src/LYLocal.c:1181
+#: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
 msgstr "¬O§_²¾°£²Å¸¹³sµ²¡H"
 
-#: src/LYLocal.c:1276
+#: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr ""
 
-#: src/LYLocal.c:1306
+#: src/LYLocal.c:1308
 msgid "Unable to open permit options file"
 msgstr ""
 
-#: src/LYLocal.c:1336
+#: src/LYLocal.c:1338
 msgid "Specify permissions below:"
 msgstr "½Ð«ü©w¥H¤UªºÅv­­¡G"
 
-#: src/LYLocal.c:1337 src/LYShowInfo.c:260
+#: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
 msgstr "¾Ö¦³ªÌ¡G"
 
-#: src/LYLocal.c:1353
+#: src/LYLocal.c:1355
 msgid "Group"
 msgstr "©ÒÄݸs²Õ"
 
-#: src/LYLocal.c:1369
+#: src/LYLocal.c:1371
 msgid "Others:"
 msgstr "¨ä¥¦¡G"
 
-#: src/LYLocal.c:1387
+#: src/LYLocal.c:1389
 msgid "form to permit"
 msgstr ""
 
-#: src/LYLocal.c:1482
+#: src/LYLocal.c:1484
 msgid "Invalid mode format."
 msgstr ""
 
-#: src/LYLocal.c:1486
+#: src/LYLocal.c:1488
 msgid "Invalid syntax format."
 msgstr "µL®Äªº»yªk®æ¦¡¡C"
 
-#: src/LYLocal.c:1668
+#: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "ĵ§i¡I¤w¸g UUDecode ªºÀÉ®×·|©ñ¦b°õ¦æ Lynx ®Éªº¥Ø¿ý¡C"
 
-#: src/LYLocal.c:1858
+#: src/LYLocal.c:1860
 msgid "NULL URL pointer"
 msgstr ""
 
-#: src/LYLocal.c:1940
+#: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
 msgstr "¥¿¦b°õ¦æ %s "
 
-#: src/LYLocal.c:1943
+#: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
 msgstr "¥¿¦b°õ¦æ¨t²Î«ü¥O¡C¥i¯à»Ý­nµyµ¥¤@¬q®É¶¡¡C"
 
-#: src/LYLocal.c:2015
+#: src/LYLocal.c:2017
 msgid "Current directory:"
 msgstr "¥Ø«eªº¥Ø¿ý¡G"
 
-#: src/LYLocal.c:2018 src/LYLocal.c:2036
+#: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
 msgstr "¥Ø«e¿ï¾Üªº¶µ¥Ø¡G"
 
-#: src/LYLocal.c:2022
+#: src/LYLocal.c:2024
 msgid "Nothing currently selected."
 msgstr "¥¼¿ï¨ú¥ô¦ó¶µ¥Ø¡C"
 
-#: src/LYLocal.c:2038
+#: src/LYLocal.c:2040
 msgid "tagged item:"
 msgstr "­Ó¥[¤W¼Ð°Oªº¶µ¥Ø¡G"
 
-#: src/LYLocal.c:2039
+#: src/LYLocal.c:2041
 msgid "tagged items:"
 msgstr "­Ó¥[¤W¼Ð°Oªº¶µ¥Ø¡G"
 
-#: src/LYLocal.c:2136 src/LYLocal.c:2147
+#: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
 msgstr "¤£¦XªkªºÀɮצWºÙ¡F©¿²¤¸Ó­n¨D¡C"
 
 #. directory not writable
-#: src/LYLocal.c:2245 src/LYLocal.c:2304
+#: src/LYLocal.c:2247 src/LYLocal.c:2306
 msgid "Install in the selected directory not permitted."
 msgstr ""
 
-#: src/LYLocal.c:2300
+#: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "¿ï¨úªº¶µ¥Ø¤£¬O¥Ø¿ý¡I©¿²¤¸Ó­n¨D¡C"
 
-#: src/LYLocal.c:2309
+#: src/LYLocal.c:2311
 msgid "Just a moment, ..."
 msgstr "½Ðµyµ¥¡A..."
 
-#: src/LYLocal.c:2326
+#: src/LYLocal.c:2328
 msgid "Error building install args"
 msgstr ""
 
-#: src/LYLocal.c:2341 src/LYLocal.c:2372
+#: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "¨Ó·½¤Î¥Øªº¦a¬Û¦P¡G%s"
 
-#: src/LYLocal.c:2348 src/LYLocal.c:2379
+#: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
 msgid "Already in target directory: %s"
 msgstr ""
 
-#: src/LYLocal.c:2397
+#: src/LYLocal.c:2399
 msgid "Installation complete"
 msgstr "¦w¸Ë§¹¦¨"
 
-#: src/LYLocal.c:2584
+#: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
 msgstr ""
 
@@ -4204,19 +4205,19 @@ msgstr ""
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1022
+#: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
 msgstr "§ä¤£¨ì Winsock¡A©êºp¡C"
 
-#: src/LYMain.c:1225
+#: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "»Õ¤U *¥²¶·* «ü©w¦³®Äªº TMP ©Î TEMP ¦ì¸m¡I"
 
-#: src/LYMain.c:1278 src/LYMainLoop.c:5074
+#: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
 msgstr "¸Ó¥Ø¿ý¤£¦s¦b"
 
-#: src/LYMain.c:1463
+#: src/LYMain.c:1464
 #, c-format
 msgid ""
 "\n"
@@ -4227,7 +4228,7 @@ msgstr ""
 "³]©wÀÉ %s ¤£¦s¦b¡C\n"
 "\n"
 
-#: src/LYMain.c:1473
+#: src/LYMain.c:1474
 #, c-format
 msgid ""
 "\n"
@@ -4238,7 +4239,7 @@ msgstr ""
 "¥¼«Å§i Lynx ©Ò¥Îªº¦r¤¸¶°¡C\n"
 "\n"
 
-#: src/LYMain.c:1502
+#: src/LYMain.c:1503
 #, c-format
 msgid ""
 "\n"
@@ -4246,7 +4247,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1578
+#: src/LYMain.c:1579
 #, c-format
 msgid ""
 "\n"
@@ -4257,68 +4258,68 @@ msgstr ""
 "Lynx ÀÉ®× %s ¤£¦s¦b¡C\n"
 "\n"
 
-#: src/LYMain.c:1653
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1655
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1803
+#: src/LYMain.c:1804
 msgid "Warning:"
 msgstr "ĵ§i¡G"
 
-#: src/LYMain.c:2371
+#: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2616 src/LYMain.c:2661
+#: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx¡G©¿²¤µLªkÃѧOªº¦r¤¸¶° %s\n"
 
-#: src/LYMain.c:3180
+#: src/LYMain.c:3181
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s ª©¥» %s (%s)\n"
 
-#: src/LYMain.c:3218
+#: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "½sĶ©ó %s %s %s\n"
 
-#: src/LYMain.c:3240
+#: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "ª©Åv©Ò¦³¡GUniversity of Kansas¡BCERN ¤Î¨ä¥¦¦³°^ÄmªÌ¡C"
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "¨Ï¥Î GNU General Public License µo§G¡C"
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "­Y»Ý­n§ó¦h¸ê®Æ¡A½ÐÂsÄý http://lynx.isc.org/ ¤Îºô¤Wªº»¡©ú¤å¥ó¡C"
 
-#: src/LYMain.c:4060
+#: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "¥Îªk¡G%s [¿ï¶µ] [ÀÉ®×]\n"
 
-#: src/LYMain.c:4061
+#: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
 msgstr "¿ï¶µ¥]¬A¡G\n"
 
-#: src/LYMain.c:4360
+#: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s¡GµL®Äªº¿ï¶µ¡G%s\n"
@@ -4347,7 +4348,7 @@ msgstr "¨D§U»¡©úµe­±"
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5324
+#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
 msgid "Entry into main screen"
 msgstr ""
 
@@ -4371,66 +4372,66 @@ msgstr "¸ô®|¤¤ªº¤@³¡¥÷¤£¬O¥Ø¿ý"
 msgid "failed to change directory"
 msgstr "µLªk¶i¤J¥Ø¿ý"
 
-#: src/LYMainLoop.c:6256
+#: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
 msgstr "®Ú¾Ú¥Ø«eªº³]©w­«·s¤ÀªR¤å¥ó..."
 
-#: src/LYMainLoop.c:6547
+#: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "ÄY­«¿ù»~ ¢w µLªk¶}±Ò¿é¥XÀÉ %s\n"
 
-#: src/LYMainLoop.c:6884
+#: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:6887
+#: src/LYMainLoop.c:6883
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6960
 #, fuzzy
 msgid "Current URL is empty."
 msgstr "¥Ø«eªº¥Ø¿ý¡G"
 
-#: src/LYMainLoop.c:6966 src/LYUtils.c:1817
+#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:6968
+#: src/LYMainLoop.c:6964
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6966
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:6997
+#: src/LYMainLoop.c:6993
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7668 src/LYMainLoop.c:7838
+#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
 msgstr "¢w¯Á¤Þ¢w"
 
-#: src/LYMainLoop.c:7778
+#: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
 msgstr "lynx¡GµLªk¦s¨ú¶}©lªººô­¶"
 
-#: src/LYMainLoop.c:7790
+#: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:7791
+#: src/LYMainLoop.c:7787
 msgid "      Exiting..."
 msgstr "      ·Ç³ÆÂ÷¶}..."
 
-#: src/LYMainLoop.c:7832
+#: src/LYMainLoop.c:7828
 msgid "-more-"
 msgstr "¢wÁÙ¦³¤º®e¢w"
 
 #. Enable scrolling.
-#: src/LYNews.c:183
+#: src/LYNews.c:186
 msgid "You will be posting to:"
 msgstr ""
 
@@ -4438,7 +4439,7 @@ msgstr ""
 #. * Get the mail address for the From header, offering personal_mail_address
 #. * as default.
 #.
-#: src/LYNews.c:192
+#: src/LYNews.c:195
 msgid ""
 "\n"
 "\n"
@@ -4452,7 +4453,7 @@ msgstr ""
 #. * Get the Subject header, offering the current document's title as the
 #. * default if this is a followup rather than a new post.  - FM
 #.
-#: src/LYNews.c:209
+#: src/LYNews.c:212
 msgid ""
 "\n"
 "\n"
@@ -4462,7 +4463,7 @@ msgstr ""
 "\n"
 " ½Ð´£¨Ñ©Î­×§ï Subject: ¼ÐÀY\n"
 
-#: src/LYNews.c:299
+#: src/LYNews.c:302
 msgid ""
 "\n"
 "\n"
@@ -4475,7 +4476,7 @@ msgstr ""
 #.
 #. * Use the built in line editior.
 #.
-#: src/LYNews.c:356
+#: src/LYNews.c:359
 msgid ""
 "\n"
 "\n"
@@ -4485,7 +4486,7 @@ msgstr ""
 "\n"
 " ½Ð¦b¥H¤Uªº¦ì¸m¿é¤J°T®§¡C"
 
-#: src/LYNews.c:402
+#: src/LYNews.c:405
 msgid "Message has no original text!"
 msgstr ""
 
@@ -5147,38 +5148,38 @@ msgstr ""
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:1880
+#: src/LYReadCFG.c:1881
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1882
+#: src/LYReadCFG.c:1883
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2291 src/LYReadCFG.c:2304 src/LYReadCFG.c:2362
+#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
 msgstr "¥H¤U¬O±q»Õ¤Uªº lynx.cfg ÀÉ®×Ū¨úªº³]©w¡C"
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305
+#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
 msgstr ""
 
-#: src/LYReadCFG.c:2298 src/LYReadCFG.c:2308
+#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:2344
+#: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
 msgstr "­«·s¸ü¤J§ó§ï«áªº³]©w"
 
-#: src/LYReadCFG.c:2352
+#: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
 msgstr "¥D­n²ÕºA"
 
@@ -5214,27 +5215,27 @@ msgstr "¥Ø«e¿ï¨úªº¶µ¥Ø"
 msgid "Full name:"
 msgstr "§¹¾ã¦WºÙ¡G"
 
-#: src/LYShowInfo.c:212
+#: src/LYShowInfo.c:213
 msgid "Unable to follow link"
 msgstr ""
 
-#: src/LYShowInfo.c:214
+#: src/LYShowInfo.c:215
 msgid "Points to file:"
 msgstr ""
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:220
 msgid "Name of owner:"
 msgstr "¾Ö¦³ªÌ¦WºÙ¡G"
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:223
 msgid "Group name:"
 msgstr "¸s²Õ¦WºÙ¡G"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:225
 msgid "File size:"
 msgstr "Àɮפj¤p¡G"
 
-#: src/LYShowInfo.c:226
+#: src/LYShowInfo.c:227
 #, fuzzy
 msgid "(bytes)"
 msgstr "¦ì¤¸²Õ"
@@ -5242,161 +5243,161 @@ msgstr "¦ì¤¸²Õ"
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:232
 msgid "Creation date:"
 msgstr "»s§@¤é´Á¡G"
 
-#: src/LYShowInfo.c:234
+#: src/LYShowInfo.c:235
 msgid "Last modified:"
 msgstr "³Ì«á­×§ï®É¶¡¡G"
 
-#: src/LYShowInfo.c:237
+#: src/LYShowInfo.c:238
 msgid "Last accessed:"
 msgstr "³Ì«á¦s¨ú®É¶¡¡G"
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:244
 msgid "Access Permissions"
 msgstr "¦s¨úªºÅv­­"
 
-#: src/LYShowInfo.c:278
+#: src/LYShowInfo.c:279
 #, fuzzy
 msgid "Group:"
 msgstr "©ÒÄݸs²Õ"
 
-#: src/LYShowInfo.c:298
+#: src/LYShowInfo.c:299
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:305
+#: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
 msgstr "¥Ø«e¥¿¦bÂsÄýªºÀÉ®×"
 
-#: src/LYShowInfo.c:313 src/LYShowInfo.c:417
+#: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
 msgstr "Ãìµ²¦WºÙ¡G"
 
-#: src/LYShowInfo.c:319 src/LYShowInfo.c:334
+#: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
 msgstr "¦r¤¸¶°¡G"
 
-#: src/LYShowInfo.c:333
+#: src/LYShowInfo.c:334
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:340
+#: src/LYShowInfo.c:341
 msgid "Server:"
 msgstr "¦øªA¾¹¡G"
 
-#: src/LYShowInfo.c:343
+#: src/LYShowInfo.c:344
 msgid "Date:"
 msgstr "¤é´Á¡G"
 
-#: src/LYShowInfo.c:346
+#: src/LYShowInfo.c:347
 msgid "Last Mod:"
 msgstr "³Ì«á­×§ï¡G"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:352
 msgid "Expires:"
 msgstr ""
 
-#: src/LYShowInfo.c:354
+#: src/LYShowInfo.c:355
 msgid "Cache-Control:"
 msgstr ""
 
-#: src/LYShowInfo.c:357
+#: src/LYShowInfo.c:358
 msgid "Content-Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:361
+#: src/LYShowInfo.c:362
 msgid "Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:367
 msgid "Language:"
 msgstr "»y¨¥¡G"
 
-#: src/LYShowInfo.c:373
+#: src/LYShowInfo.c:374
 msgid "Post Data:"
 msgstr ""
 
-#: src/LYShowInfo.c:376
+#: src/LYShowInfo.c:377
 msgid "Post Content Type:"
 msgstr ""
 
-#: src/LYShowInfo.c:379
+#: src/LYShowInfo.c:380
 msgid "Owner(s):"
 msgstr "¾Ö¦³ªÌ¡G"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:385
 msgid "size:"
 msgstr "¤j¤p¡G"
 
-#: src/LYShowInfo.c:386
+#: src/LYShowInfo.c:387
 msgid "lines"
 msgstr "¦æ"
 
-#: src/LYShowInfo.c:390
+#: src/LYShowInfo.c:391
 msgid "forms mode"
 msgstr ""
 
-#: src/LYShowInfo.c:392
+#: src/LYShowInfo.c:393
 msgid "source"
 msgstr ""
 
-#: src/LYShowInfo.c:393
+#: src/LYShowInfo.c:394
 msgid "normal"
 msgstr ""
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:396
 msgid ", safe"
 msgstr ""
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:398
 msgid ", via internal link"
 msgstr ""
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:403
 msgid ", no-cache"
 msgstr ""
 
-#: src/LYShowInfo.c:404
+#: src/LYShowInfo.c:405
 msgid ", ISMAP script"
 msgstr ""
 
-#: src/LYShowInfo.c:406
+#: src/LYShowInfo.c:407
 msgid ", bookmark file"
 msgstr ""
 
-#: src/LYShowInfo.c:410
+#: src/LYShowInfo.c:411
 msgid "mode:"
 msgstr "¼Ò¦¡¡G"
 
-#: src/LYShowInfo.c:416
+#: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
 msgstr "¥Ø«e¤w¿ï¨úªºÃìµ²"
 
-#: src/LYShowInfo.c:425
+#: src/LYShowInfo.c:426
 msgid "Method:"
 msgstr ""
 
-#: src/LYShowInfo.c:429
+#: src/LYShowInfo.c:430
 msgid "Enctype:"
 msgstr "½s½X¤è¦¡¡G"
 
-#: src/LYShowInfo.c:435
+#: src/LYShowInfo.c:436
 #, fuzzy
 msgid "Action:"
 msgstr "¦ì¸m¡G"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:441
 msgid "(Form field)"
 msgstr ""
 
-#: src/LYShowInfo.c:449
+#: src/LYShowInfo.c:450
 msgid "No Links on the current page"
 msgstr "¸Ó­¶­±¨S¦³¥ô¦óÃìµ²"
 
-#: src/LYShowInfo.c:454
+#: src/LYShowInfo.c:455
 #, fuzzy
 msgid "Server Headers:"
 msgstr "¦øªA¾¹¡G"
@@ -5444,33 +5445,33 @@ msgstr "¤W¶Ç¦Ü¡G"
 msgid "Upload options:"
 msgstr "¤W¶Ç¿ï¶µ¡G"
 
-#: src/LYUtils.c:1819
+#: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
 msgstr ""
 
-#: src/LYUtils.c:2604
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3408
+#: src/LYUtils.c:3419
 msgid "Too many tempfiles"
 msgstr "¤Ó¦h¼È¦sÀÉ"
 
-#: src/LYUtils.c:3708
+#: src/LYUtils.c:3719
 msgid "unknown restriction"
 msgstr ""
 
-#: src/LYUtils.c:3739
+#: src/LYUtils.c:3750
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3742
+#: src/LYUtils.c:3753
 #, c-format
 msgid "Restrictions set:\n"
 msgstr ""
 
-#: src/LYUtils.c:5120
+#: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
 msgstr "§ä¤£¨ì­Ó¤H¥Ø¿ý"
 
diff --git a/samples/keepviewer b/samples/keepviewer
deleted file mode 100755
index f5c0b2c1..00000000
--- a/samples/keepviewer
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# This script can be invoked as a wrapper for an external viewer by lynx, e.g., 
-# given this line in lynx.cfg
-#	XLOADIMAGE_COMMAND:keepviewer xli %s &
-# it will invoke xli on a hardlink to the file (which is assumed to be in the
-# temporary directory created by lynx), and clean up when the viewer exits.
-#
-# Parameters:
-#	$1 is viewer
-#	$2 is filename
-if test $# = 2 ; then
-	chmod 600 $2
-	myfile=`echo $2 | sed -e 's@\(.*/tmp/\)\([^/]*/\)\?\(.*\)@\1my\3@'`
-	ln $2 $myfile || exit 1
-	trap "rm -f $myfile" 0 1 2 5 15
-	eval $1 $myfile
-else
-	echo "Usage: keepviewer <viewer> <filename>"
-	exit 1
-fi
diff --git a/samples/mime.types b/samples/mime.types
deleted file mode 100644
index 6393c307..00000000
--- a/samples/mime.types
+++ /dev/null
@@ -1,26 +0,0 @@
-# example mime.types file.
-# see the NCSA X Mosaic documentation at
-# http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/Docs/extension-map.html
-# for more details
-# [Lynx uses mime.types mapping for ftp and local files only,
-# http server does specify MIME type in the Content-Type header].
-
-application/postscript         ai eps ps
-application/rtf                rtf
-application/x-tex              tex
-application/x-texinfo          texinfo texi
-application/x-troff            t tr roff
-audio/basic                    au snd
-audio/x-aiff                   aif aiff aifc
-audio/x-wav                    wav
-image/gif                      gif
-image/ief                      ief
-image/jpeg                     jpeg jpg jpe
-image/tiff                     tiff tif
-image/x-xwindowdump            xwd
-text/html                      html
-text/plain                     txt c cc h
-video/mpeg                     mpeg mpg mpe
-video/quicktime                qt mov
-video/x-msvideo                avi
-video/x-sgi-movie              movie
diff --git a/src/GridText.c b/src/GridText.c
index ed66c4f9..3cf376b7 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.156 2008/09/21 19:48:41 tom Exp $
+ * $LynxId: GridText.c,v 1.158 2008/12/07 18:50:31 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -6848,9 +6848,7 @@ void HTCheckFnameForCompression(char **fname,
     char *dot = NULL;
     char *cp = NULL;
     const char *suffix = "";
-    const char *ct = NULL;
-    const char *ce = NULL;
-    CompressFileType method = cftNone;
+    CompressFileType method;
     CompressFileType second;
 
     /*
@@ -6865,30 +6863,7 @@ void HTCheckFnameForCompression(char **fname,
     if (*(fn = LYPathLeaf(fn)) == '\0')
 	return;
 
-    /*
-     * Check the anchor's content_type and content_encoding
-     * elements for a gzip or Unix compressed file.  -FM
-     */
-    ct = HTAnchor_content_type(anchor);
-    ce = HTAnchor_content_encoding(anchor);
-    if (ce == NULL && ct != 0) {
-	/*
-	 * No Content-Encoding, so check
-	 * the Content-Type.  -FM
-	 */
-	if (!strncasecomp(ct, "application/gzip", 16) ||
-	    !strncasecomp(ct, "application/x-gzip", 18)) {
-	    method = cftGzip;
-	} else if (!strncasecomp(ct, "application/compress", 20) ||
-		   !strncasecomp(ct, "application/x-compress", 22)) {
-	    method = cftCompress;
-	} else if (!strncasecomp(ct, "application/bzip2", 17) ||
-		   !strncasecomp(ct, "application/x-bzip2", 19)) {
-	    method = cftBzip2;
-	}
-    } else if (ce != 0) {
-	method = HTEncodingToCompressType(ce);
-    }
+    method = HTContentToCompressType(anchor);
 
     /*
      * If no Content-Encoding has been detected via the anchor
@@ -6958,23 +6933,7 @@ void HTCheckFnameForCompression(char **fname,
 	}
     }
 
-    switch (method) {
-    case cftNone:
-	suffix = "";
-	break;
-    case cftCompress:
-	suffix = ".Z";
-	break;
-    case cftDeflate:
-	suffix = ".zz";
-	break;
-    case cftGzip:
-	suffix = ".gz";
-	break;
-    case cftBzip2:
-	suffix = ".bz2";
-	break;
-    }
+    suffix = HTCompressTypeToSuffix(method);
 
     /*
      * Add the appropriate suffix.  -FM
diff --git a/src/LYCgi.c b/src/LYCgi.c
index 1d078025..45ec8ee6 100644
--- a/src/LYCgi.c
+++ b/src/LYCgi.c
@@ -1,4 +1,6 @@
-/*                   Lynx CGI support                              LYCgi.c
+/*
+ * $LynxId: LYCgi.c,v 1.53 2008/12/07 22:13:52 tom Exp $
+ *                   Lynx CGI support                              LYCgi.c
  *                   ================
  *
  * Authors
@@ -358,7 +360,7 @@ static int LYLoadCGI(const char *arg,
 	HTFormat format_in;
 	HTStream *target = NULL;	/* Unconverted data */
 	int fd1[2], fd2[2];
-	char buf[1024];
+	char buf[MAX_LINE];
 	int pid;
 
 #ifdef HAVE_TYPE_UNIONWAIT
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index 87d9428f..650a510d 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYGlobalDefs.h,v 1.110 2008/09/10 11:56:53 tom Exp $
+ * $LynxId: LYGlobalDefs.h,v 1.112 2008/12/07 22:39:32 tom Exp $
  *
  * global variable definitions
  */
@@ -141,8 +141,8 @@ extern "C" {
 #define ADVANCED_MODE 	  2
     extern BOOLEAN LYUseNoviceLineTwo;	/* True if TOGGLE_HELP is not mapped */
 
-#define MAX_LINE 1024		/* Hope that no window is larger than this */
-#define MAX_COLS 999		/* we don't expect wider than this */
+#define MAX_LINE 1024		/* No window can be wider than this */
+#define MAX_COLS (MAX_LINE-10)	/* we don't expect wider than this */
 #define DFT_COLS 80		/* ...and normally only this */
 #define DFT_ROWS 24		/* ...corresponding nominal height */
 
@@ -585,6 +585,7 @@ extern "C" {
 
     extern BOOL force_empty_hrefless_a;
     extern int connect_timeout;
+    extern int reading_timeout;
 
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
     extern BOOL textfields_need_activation;
diff --git a/src/LYJump.c b/src/LYJump.c
index f3af593f..79aacd4f 100644
--- a/src/LYJump.c
+++ b/src/LYJump.c
@@ -1,3 +1,6 @@
+/*
+ * $LynxId: LYJump.c,v 1.33 2008/12/07 22:13:37 tom Exp $
+ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 #include <LYUtils.h>
@@ -363,6 +366,7 @@ static unsigned LYRead_Jumpfile(struct JumpTable *jtp)
     int fd;
 
 #ifdef VMS
+    int blocksize = 1024;
     FILE *fp;
     BOOL IsStream_LF = TRUE;
 #endif /* VMS */
@@ -415,12 +419,12 @@ static unsigned LYRead_Jumpfile(struct JumpTable *jtp)
 #ifdef VMS
     } else {
 	/** Handle as a series of records. **/
-	if (fgets(mp, 1024, fp) == NULL) {
+	if (fgets(mp, blocksize, fp) == NULL) {
 	    HTAlert(ERROR_READING_JUMP_FILE);
 	    FREE(mp);
 	    return 0;
 	} else
-	    while (fgets(mp + strlen(mp), 1024, fp) != NULL) {
+	    while (fgets(mp + strlen(mp), blocksize, fp) != NULL) {
 		;
 	    }
 	LYCloseInput(fp);
diff --git a/src/LYLocal.c b/src/LYLocal.c
index dc705be4..3aa2a1ee 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -1,4 +1,6 @@
 /*
+ * $LynxId: LYLocal.c,v 1.84 2008/12/07 22:13:37 tom Exp $
+ *
  *  Routines to manipulate the local filesystem.
  *  Written by: Rick Mallett, Carleton University
  *  Report problems to rmallett@ccs.carleton.ca
@@ -660,7 +662,7 @@ static int modify_tagged(char *testpath)
     dev_t dev;
     ino_t inode;
     int owner;
-    char tmpbuf[1024];
+    char tmpbuf[MAX_LINE];
     char *savepath;
     char *srcpath = NULL;
     struct stat dir_info;
@@ -873,7 +875,7 @@ static int modify_location(char *testpath)
     dev_t dev;
     ino_t inode;
     int owner;
-    char tmpbuf[1024];
+    char tmpbuf[MAX_LINE];
     char *newpath = NULL;
     char *savepath = NULL;
     struct stat dir_info;
diff --git a/src/LYMain.c b/src/LYMain.c
index b823eef3..f1ab491f 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.186 2008/09/10 23:05:36 tom Exp $
+ * $LynxId: LYMain.c,v 1.187 2008/12/07 20:52:27 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -555,6 +555,7 @@ int ssl_noprompt = FORCE_PROMPT_DFT;
 #endif
 
 int connect_timeout = 18000; /*=180000*0.1 - used in HTDoConnect.*/
+int reading_timeout = 18000; /*=180000*0.1 - used in HTDoConnect.*/
 
 #ifdef EXP_JUSTIFY_ELTS
 BOOL ok_justify = FALSE;
@@ -3782,6 +3783,10 @@ or CJK mode for the startup character set"
       "realm",		4|SET_ARG,		check_realm,
       "restricts access to URLs in the starting realm"
    ),
+   PARSE_INT(
+      "read_timeout",	4|NEED_INT_ARG,		reading_timeout,
+      "=N\nset the N-second read-timeout"
+   ),
    PARSE_SET(
       "reload",		4|SET_ARG,		reloading,
       "flushes the cache on a proxy server\n(only the first document affected)"
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 5cbcafe7..a1b060ec 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.153 2008/09/17 22:52:58 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.154 2008/12/07 22:10:34 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -201,7 +201,7 @@ HTList *Goto_URLs = NULL;	/* List of Goto URLs */
 char *LYRequestTitle = NULL;	/* newdoc.title in calls to getfile() */
 char *LYRequestReferer = NULL;	/* Referer, may be set in getfile() */
 
-static char prev_target[512];
+static char prev_target[MAX_LINE];
 
 #ifdef DISP_PARTIAL
 BOOLEAN display_partial = FALSE;	/* could be enabled in HText_new() */
@@ -5228,12 +5228,8 @@ static BOOLEAN handle_LYK_LINEWRAP_TOGGLE(int *cmd,
 int mainloop(void)
 {
 #if defined(WIN_EX)		/* 1997/10/08 (Wed) 14:52:06 */
-#undef	STRING_MAX
-#define	STRING_MAX	4096
-    char temp_buff[STRING_MAX];
-
-#define	BUFF_MAX	1024
-    char sjis_buff[BUFF_MAX];
+    char sjis_buff[MAX_LINE];
+    char temp_buff[sizeof(sjis_buffer) * 4];
 #endif
     int c = 0;
     int real_c = 0;
@@ -6465,7 +6461,7 @@ int mainloop(void)
 		    p = links[curdoc.link].lname;
 		}
 
-		if (strlen(p) < 500) {
+		if (strlen(p) < (sizeof(sjis_buff) / 10)) {
 		    strcpy(temp_buff, p);
 		    if (strchr(temp_buff, '%')) {
 			HTUnEscape(temp_buff);
diff --git a/src/LYNews.c b/src/LYNews.c
index 1034d86d..e4b435df 100644
--- a/src/LYNews.c
+++ b/src/LYNews.c
@@ -1,3 +1,6 @@
+/*
+ * $LynxId: LYNews.c,v 1.53 2008/12/07 22:13:37 tom Exp $
+ */
 #include <HTUtils.h>
 #ifndef DISABLE_NEWS
 #include <HTParse.h>
@@ -82,8 +85,8 @@ static BOOLEAN message_has_content(const char *filename,
 char *LYNewsPost(char *newsgroups,
 		 BOOLEAN followup)
 {
-    char user_input[1024];
-    char CJKinput[1024];
+    char user_input[MAX_LINE];
+    char CJKinput[MAX_LINE];
     char *cp = NULL;
     const char *kp = NULL;
     int c = 0;			/* user input */
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 718344fd..3f259e45 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYReadCFG.c,v 1.129 2008/09/10 12:06:23 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.130 2008/12/07 20:52:27 tom Exp $
  */
 #ifndef NO_RULES
 #include <HTRules.h>
@@ -1512,6 +1512,7 @@ static Config_Type Config_Table [] =
 #endif
      PARSE_ADD(RC_PRINTER,              printers),
      PARSE_SET(RC_QUIT_DEFAULT_YES,     LYQuitDefaultYes),
+     PARSE_INT(RC_READ_TIMEOUT,         reading_timeout),
      PARSE_FUN(RC_REFERER_WITH_QUERY,   referer_with_query_fun),
 #ifdef EXP_CMD_LOGGING
      PARSE_TIM(RC_REPLAYSECS,           ReplaySecs),
diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c
index 2be79dd2..f335a4a8 100644
--- a/src/LYShowInfo.c
+++ b/src/LYShowInfo.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYShowInfo.c,v 1.65 2007/05/06 19:08:31 tom Exp $ */
+/* $LynxId: LYShowInfo.c,v 1.66 2008/12/07 22:14:05 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFile.h>
 #include <HTParse.h>
@@ -203,13 +203,14 @@ int LYShowInfo(DocInfo *doc,
 	    ADD_SS(gettext("Full name:"), temp);
 #ifdef S_IFLNK
 	    if (S_ISLNK(dir_info.st_mode)) {
-		char buf[1025];
+		char buf[MAX_LINE];
 		int buf_size;
 
 		if ((buf_size = readlink(temp, buf, sizeof(buf) - 1)) != -1) {
 		    buf[buf_size] = '\0';
 		} else {
-		    sprintf(buf, "%.1024s", gettext("Unable to follow link"));
+		    sprintf(buf, "%.*s", (int) sizeof(buf) - 1,
+									gettext("Unable to follow link"));
 		}
 		ADD_SS(gettext("Points to file:"), buf);
 	    }
diff --git a/src/LYUtils.c b/src/LYUtils.c
index e40d2544..87a059c5 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.176 2008/09/21 23:26:30 tom Exp $
+ * $LynxId: LYUtils.c,v 1.177 2008/09/22 22:48:31 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -16,7 +16,16 @@ extern int kbhit(void);		/* FIXME: use conio.h */
 
 #elif defined(_WINDOWS)
 
+#ifdef DONT_USE_GETTEXT
+#undef gettext
+#endif
+
 #include <conio.h>
+
+#ifdef DONT_USE_GETTEXT
+#define gettext(s) s
+#endif
+
 #if !defined(kbhit) && defined(_WCONIO_DEFINED)
 #define kbhit() _kbhit()	/* reasonably recent conio.h */
 #endif
diff --git a/src/LYrcFile.h b/src/LYrcFile.h
index 1d7e3344..ed617786 100644
--- a/src/LYrcFile.h
+++ b/src/LYrcFile.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYrcFile.h,v 1.27 2008/09/10 20:28:59 tom Exp $
+ * $LynxId: LYrcFile.h,v 1.28 2008/12/07 20:52:27 tom Exp $
  */
 #ifndef LYRCFILE_H
 #define LYRCFILE_H
@@ -69,7 +69,6 @@
 #define RC_DISPLAY                      "display"
 #define RC_DISPLAY_CHARSET_CHOICE       "display_charset_choice"
 #define RC_DOWNLOADER                   "downloader"
-#define RC_POSITIONABLE_EDITOR		"positionable_editor"
 #define RC_EMACS_KEYS                   "emacs_keys"
 #define RC_EMACS_KEYS_ALWAYS_ON         "emacs_keys_always_on"
 #define RC_ENABLE_LYNXRC                "enable_lynxrc"
@@ -169,6 +168,7 @@
 #define RC_PERSONAL_EXTENSION_MAP       "personal_extension_map"
 #define RC_PERSONAL_MAILCAP             "personal_mailcap"
 #define RC_PERSONAL_MAIL_ADDRESS        "personal_mail_address"
+#define RC_POSITIONABLE_EDITOR		"positionable_editor"
 #define RC_PREFERRED_CHARSET            "preferred_charset"
 #define RC_PREFERRED_ENCODING           "preferred_encoding"
 #define RC_PREFERRED_LANGUAGE           "preferred_language"
@@ -181,6 +181,7 @@
 #define RC_PRINTER                      "printer"
 #define RC_QUIT_DEFAULT_YES             "quit_default_yes"
 #define RC_RAW_MODE                     "raw_mode"
+#define RC_READ_TIMEOUT                 "read_timeout"
 #define RC_REFERER_WITH_QUERY           "referer_with_query"
 #define RC_REPLAYSECS                   "replaysecs"
 #define RC_REUSE_TEMPFILES              "reuse_tempfiles"
@@ -252,8 +253,8 @@
 #define RC_VI_KEYS                      "vi_keys"
 #define RC_VI_KEYS_ALWAYS_ON            "vi_keys_always_on"
 #define RC_WAIS_PROXY                   "wais_proxy"
-#define RC_XLOADIMAGE_COMMAND           "xloadimage_command"
 #define RC_XHTML_PARSING                "xhtml_parsing"
+#define RC_XLOADIMAGE_COMMAND           "xloadimage_command"
 #define RC_ZCAT_PATH                    "zcat_path"
 #define RC_ZIP_PATH                     "zip_path"
 
diff --git a/src/chrtrans/dmcs_uni.tbl b/src/chrtrans/dmcs_uni.tbl
deleted file mode 100644
index 51072fad..00000000
--- a/src/chrtrans/dmcs_uni.tbl
+++ /dev/null
@@ -1,233 +0,0 @@
-#The MIME name of this charset.
-Mdec-mcs
-
-#Name as a Display Charset (used on Options screen)
-ODEC Multinational
-
-#
-#   Name:             DEC Multinational (dec-mcs) [to unicode]
-#   Date:             29 October 1997
-#   Author:           Fote
-#
-#   1999-01-01	various corrections, verified against actual DEC VT220
-#		Christian "naddy" Weisgerber <naddy@mips.rhein-neckar.de>
-#
-##################
-
-#0x20    U+0020  # SPACE
-#0x21    U+0021  # EXCLAMATION MARK
-#0x22    U+0022  # QUOTATION MARK
-#0x23    U+0023  # NUMBER SIGN
-#0x24    U+0024  # DOLLAR SIGN
-#0x25    U+0025  # PERCENT SIGN
-#0x26    U+0026  # AMPERSAND
-#0x27    U+0027  # APOSTROPHE
-#0x28    U+0028  # LEFT PARENTHESIS
-#0x29    U+0029  # RIGHT PARENTHESIS
-#0x2A    U+002A  # ASTERISK
-#0x2B    U+002B  # PLUS SIGN
-#0x2C    U+002C  # COMMA
-#0x2D    U+002D  # HYPHEN-MINUS
-#0x2E    U+002E  # FULL STOP
-#0x2F    U+002F  # SOLIDUS
-#0x30    U+0030  # DIGIT ZERO
-#0x31    U+0031  # DIGIT ONE
-#0x32    U+0032  # DIGIT TWO
-#0x33    U+0033  # DIGIT THREE
-#0x34    U+0034  # DIGIT FOUR
-#0x35    U+0035  # DIGIT FIVE
-#0x36    U+0036  # DIGIT SIX
-#0x37    U+0037  # DIGIT SEVEN
-#0x38    U+0038  # DIGIT EIGHT
-#0x39    U+0039  # DIGIT NINE
-#0x3A    U+003A  # COLON
-#0x3B    U+003B  # SEMICOLON
-#0x3C    U+003C  # LESS-THAN SIGN
-#0x3D    U+003D  # EQUALS SIGN
-#0x3E    U+003E  # GREATER-THAN SIGN
-#0x3F    U+003F  # QUESTION MARK
-#0x40    U+0040  # COMMERCIAL AT
-#0x41    U+0041  # LATIN CAPITAL LETTER A
-#0x42    U+0042  # LATIN CAPITAL LETTER B
-#0x43    U+0043  # LATIN CAPITAL LETTER C
-#0x44    U+0044  # LATIN CAPITAL LETTER D
-#0x45    U+0045  # LATIN CAPITAL LETTER E
-#0x46    U+0046  # LATIN CAPITAL LETTER F
-#0x47    U+0047  # LATIN CAPITAL LETTER G
-#0x48    U+0048  # LATIN CAPITAL LETTER H
-#0x49    U+0049  # LATIN CAPITAL LETTER I
-#0x4A    U+004A  # LATIN CAPITAL LETTER J
-#0x4B    U+004B  # LATIN CAPITAL LETTER K
-#0x4C    U+004C  # LATIN CAPITAL LETTER L
-#0x4D    U+004D  # LATIN CAPITAL LETTER M
-#0x4E    U+004E  # LATIN CAPITAL LETTER N
-#0x4F    U+004F  # LATIN CAPITAL LETTER O
-#0x50    U+0050  # LATIN CAPITAL LETTER P
-#0x51    U+0051  # LATIN CAPITAL LETTER Q
-#0x52    U+0052  # LATIN CAPITAL LETTER R
-#0x53    U+0053  # LATIN CAPITAL LETTER S
-#0x54    U+0054  # LATIN CAPITAL LETTER T
-#0x55    U+0055  # LATIN CAPITAL LETTER U
-#0x56    U+0056  # LATIN CAPITAL LETTER V
-#0x57    U+0057  # LATIN CAPITAL LETTER W
-#0x58    U+0058  # LATIN CAPITAL LETTER X
-#0x59    U+0059  # LATIN CAPITAL LETTER Y
-#0x5A    U+005A  # LATIN CAPITAL LETTER Z
-#0x5B    U+005B  # LEFT SQUARE BRACKET
-#0x5C    U+005C  # REVERSE SOLIDUS
-#0x5D    U+005D  # RIGHT SQUARE BRACKET
-#0x5E    U+005E  # CIRCUMFLEX ACCENT
-#0x5F    U+005F  # LOW LINE
-#0x60    U+0060  # GRAVE ACCENT
-#0x61    U+0061  # LATIN SMALL LETTER A
-#0x62    U+0062  # LATIN SMALL LETTER B
-#0x63    U+0063  # LATIN SMALL LETTER C
-#0x64    U+0064  # LATIN SMALL LETTER D
-#0x65    U+0065  # LATIN SMALL LETTER E
-#0x66    U+0066  # LATIN SMALL LETTER F
-#0x67    U+0067  # LATIN SMALL LETTER G
-#0x68    U+0068  # LATIN SMALL LETTER H
-#0x69    U+0069  # LATIN SMALL LETTER I
-#0x6A    U+006A  # LATIN SMALL LETTER J
-#0x6B    U+006B  # LATIN SMALL LETTER K
-#0x6C    U+006C  # LATIN SMALL LETTER L
-#0x6D    U+006D  # LATIN SMALL LETTER M
-#0x6E    U+006E  # LATIN SMALL LETTER N
-#0x6F    U+006F  # LATIN SMALL LETTER O
-#0x70    U+0070  # LATIN SMALL LETTER P
-#0x71    U+0071  # LATIN SMALL LETTER Q
-#0x72    U+0072  # LATIN SMALL LETTER R
-#0x73    U+0073  # LATIN SMALL LETTER S
-#0x74    U+0074  # LATIN SMALL LETTER T
-#0x75    U+0075  # LATIN SMALL LETTER U
-#0x76    U+0076  # LATIN SMALL LETTER V
-#0x77    U+0077  # LATIN SMALL LETTER W
-#0x78    U+0078  # LATIN SMALL LETTER X
-#0x79    U+0079  # LATIN SMALL LETTER Y
-#0x7A    U+007A  # LATIN SMALL LETTER Z
-#0x7B    U+007B  # LEFT CURLY BRACKET
-#0x7C    U+007C  # VERTICAL LINE
-#0x7D    U+007D  # RIGHT CURLY BRACKET
-#0x7E    U+007E  # TILDE
-#
-0x20-0x7E       idem	# ASCII
-
-0xA1    U+00A1  # inverted exclamation mark (&#161;) - iexcl
-0xA2    U+00A2  # cent sign (&#162;) - cent
-0xA3    U+00A3  # pound sign (&#163;) - pound
-0xA5    U+00A5  # yen sign (&#165;) - yen
-# broken vertical bar (&#166;) - brvbar, brkbar
-U+00A6:|
-0xA7    U+00A7  # section sign (&#167;) - sect
-0xA8    U+00A4  # currency sign (&#164;) - curren
-# spacing diaresis (&#168;) - uml, die
-U+00A8:"
-0xA9    U+00A9  # copyright sign (&#169;) - copy
-0xAA    U+00AA  # feminine ordinal indicator (&#170;) - ordf
-0xAB    U+00AB  # angle quotation mark, left (&#171;) - laquo
-# negation sign (&#172); - not
-U+00AC:NOT
-# soft hyphen (&#173;) - shy
-#U+00AD
-# circled R registered sign (&#174;) - reg
-U+00AE:(R)
-# spacing macron (&#175;) - hibar, macr
-U+00AF:-
-0xB0    U+00B0  # degree sign (&#176;) - deg
-0xB1    U+00B1  # plus-or-minus sign (&#177;) - plusmn
-0xB2    U+00B2  # superscript 2 (&#178;) - sup2
-0xB3    U+00B3  # superscript 3 (&#179;) - sup3
-#spacing acute (&#180;) - acute
-U+00B4:'
-0xB5    U+00B5  # micro sign (&#181;) - micro
-0xB6    U+00B6  # paragraph sign (&#182;) - para
-0xB7    U+00B7 # middle dot (&#183;) - middot
-# spacing cedilla (&#184;) - cedil
-U+00B8:,
-0xB9    U+00B9  # superscript 1 (&#185;) - sup1
-0xBA    U+00BA  # masculine ordinal indicator (&#186;) - ordm
-0xBB    U+00BB  # angle quotation mark, right (&#187;) - raquo
-0xBC    U+00BC  # fraction 1/4 (&#188;) - frac14
-0xBD    U+00BD  # fraction 1/2 (&#189;) - frac12
-# fraction 3/4 (&#190;) - frac34
-U+00BE: 3/4
-0xBF    U+00BF  # inverted question mark (&#191;) - iquest
-0xC0    U+00C0  # capital A, grave accent (&#192;) - Agrave
-0xC1    U+00C1  # capital A, acute accent (&#193;) - Aacute
-0xC2    U+00C2  # capital A, circumflex accent (&#194;) - Acirc
-0xC3    U+00C3  # capital A, tilde (&#195;) - Atilde
-0xC4    U+00C4  # capital A, dieresis or umlaut mark (&#196;) - Auml
-0xC5    U+00C5  # capital A, ring (&#197;) - Aring
-0xC6    U+00C6  # capital AE diphthong (ligature) (&#198;) - AElig
-0xC7    U+00C7  # capital C, cedilla (&#199;) - Ccedil
-0xC8    U+00C8  # capital E, grave accent (&#200;) - Egrave
-0xC9    U+00C9  # capital E, acute accent (&#201;) - Eacute
-0xCA    U+00CA  # capital E, circumflex accent (&#202;) - Ecirc
-0xCB    U+00CB  # capital E, dieresis or umlaut mark (&#203;) - Euml
-0xCC    U+00CC  # capital I, grave accent (&#204;) - Igrave
-0xCD    U+00CD  # capital I, acute accent (&#205;) - Iacute
-0xCE    U+00CE  # capital I, circumflex accent (&#206;) - Icirc
-0xCF    U+00CF  # capital I, dieresis or umlaut mark (&#207;) - Iuml
-# capital Eth, Icelandic (&#208;) - ETH */
-U+00D0:DH
-#      Dj  # capital D with stroke - Dstrok
-0xD1    U+00D1  # capital N, tilde (&#209;) - Ntilde
-0xD2    U+00D2  # capital O, grave accent (&#210;) - Ograve
-0xD3    U+00D3  # capital O, acute accent (&#211;) - Oacute
-0xD4    U+00D4  # capital O, circumflex accent (&#212;) - Ocirc
-0xD5    U+00D5  # capital O, tilde (&#213;) - Otilde
-0xD6    U+00D6  # capital O, dieresis or umlaut mark (&#214;) - Ouml
-0xD7    U+0152  # captial OE ligature (&#338;) - OElig
-# multiplication sign (&#215;) - times
-U+00D7:*
-0xD8    U+00D8  # capital O, slash (&#216;) - Oslash
-0xD9    U+00D9  # capital U, grave accent (&#217;) - Ugrave
-0xDA    U+00DA  # capital U, acute accent (&#218;) - Uacute
-0xDB    U+00DB  # capital U, circumflex accent (&#219;) - Ucirc
-0xDC    U+00DC  # capital U, dieresis or umlaut mark (&#220;) - Uuml
-0xDD    U+0178  # capital Y, dieresis or umlaut mark (&#376;) - Yuml
-# capital Y, acute accent (&#221;) - Yacute
-U+00DD:Y'
-# capital THORN, Icelandic (&#222;) - THORN */
-U+00DE:TH
-0xDF    U+00DF  # small sharp s, German (sz ligature) (&#223;) - szlig
-0xE0    U+00E0  # small a, grave accent (&#224;) - agrave
-0xE1    U+00E1  # small a, acute accent (&#225;) - aacute
-0xE2    U+00E2  # small a, circumflex accent (&#226;) - acirc
-0xE3    U+00E3  # small a, tilde (&#227;) - atilde
-0xE4    U+00E4  # small a, dieresis or umlaut mark (&#228;) - auml
-0xE5    U+00E5  # small a, ring (&#229;) - aring
-0xE6    U+00E6  # small ae diphthong (ligature) (&#230;) - aelig
-0xE7    U+00E7  # small c, cedilla (&#231;) - ccedil
-0xE8    U+00E8  # small e, grave accent (&#232;) - egrave
-0xE9    U+00E9  # small e, acute accent (&#233;) - eacute
-0xEA    U+00EA  # small e, circumflex accent (&#234;) - ecirc
-0xEB    U+00EB  # small e, dieresis or umlaut mark (&#235;) - euml
-0xEC    U+00EC  # small i, grave accent (&#236;) - igrave
-0xED    U+00ED  # small i, acute accent (&#237;) - iacute
-0xEE    U+00EE  # small i, circumflex accent (&#238;) - icirc
-0xEF    U+00EF  # small i, dieresis or umlaut mark (&#239;) - iuml
-# small eth, Icelandic (&#240;) - eth
-U+00F0:dh
-0xF1    U+00F1  # small n, tilde (&#241;) - ntilde
-0xF2    U+00F2  # small o, grave accent (&#242;) - ograve
-0xF3    U+00F3  # small o, acute accent (&#243;) - oacute
-0xF4    U+00F4  # small o, circumflex accent (&#244;) - ocirc
-0xF5    U+00F5  # small o, tilde (&#245;) - otilde
-0xF6    U+00F6  # small o, dieresis or umlaut mark (&#246;) - ouml
-0xF7    U+0153  # small oe ligature (&#339;) - oelig
-# division sign (&#247;) - divide
-U+00F7:/
-0xF8    U+00F8  # small o, slash (&#248;) - oslash
-0xF9    U+00F9  # small u, grave accent (&#249;) - ugrave
-0xFA    U+00FA  # small u, acute accent (&#250;) - uacute
-0xFB    U+00FB  # small u, circumflex accent (&#251;) - ucirc
-0xFC    U+00FC  # small u, dieresis or umlaut mark (&#252;) - uuml
-0xFD    U+00FF  # small y, dieresis or umlaut mark (&#255;) - yuml
-# small y, acute accent (&#253;) - yacute
-U+00FD:y'
-# small thorn, Icelandic (&#254;) - thorn
-U+00FE:th
-#
-# TRADE MARK SIGN
-U+2122:(TM)
diff --git a/src/chrtrans/hp_uni.tbl b/src/chrtrans/hp_uni.tbl
deleted file mode 100644
index 58025511..00000000
--- a/src/chrtrans/hp_uni.tbl
+++ /dev/null
@@ -1,212 +0,0 @@
-# The MIME name of this charset.
-Mhp-roman8
-
-# Name as a Display Charset (used on Options screen)
-OHP Roman8
-
-# This is not the default font!
-D0
-
-#
-# Name:		HP Roman8 to Unicode
-# Date:		1999-01-09
-# Authors:	Christian "naddy" Weisgerber <naddy@mips.rhein-neckar.de>
-#		Mapping by Roman Czyborra,
-#		<URL:http://czyborra.com/charsets/codepages.html#HP-Roman8>
-#
-
-0x20-0x7E idem	#	ASCII
-
-#0x20	U+0020	#	SPACE
-#0x21	U+0021	#	EXCLAMATION MARK
-#0x22	U+0022	#	QUOTATION MARK
-#0x23	U+0023	#	NUMBER SIGN
-#0x24	U+0024	#	DOLLAR SIGN
-#0x25	U+0025	#	PERCENT SIGN
-#0x26	U+0026	#	AMPERSAND
-#0x27	U+0027	#	APOSTROPHE
-#0x28	U+0028	#	LEFT PARENTHESIS
-#0x29	U+0029	#	RIGHT PARENTHESIS
-#0x2A	U+002A	#	ASTERISK
-#0x2B	U+002B	#	PLUS SIGN
-#0x2C	U+002C	#	COMMA
-#0x2D	U+002D	#	HYPHEN-MINUS
-#0x2E	U+002E	#	FULL STOP
-#0x2F	U+002F	#	SOLIDUS
-#0x30	U+0030	#	DIGIT ZERO
-#0x31	U+0031	#	DIGIT ONE
-#0x32	U+0032	#	DIGIT TWO
-#0x33	U+0033	#	DIGIT THREE
-#0x34	U+0034	#	DIGIT FOUR
-#0x35	U+0035	#	DIGIT FIVE
-#0x36	U+0036	#	DIGIT SIX
-#0x37	U+0037	#	DIGIT SEVEN
-#0x38	U+0038	#	DIGIT EIGHT
-#0x39	U+0039	#	DIGIT NINE
-#0x3A	U+003A	#	COLON
-#0x3B	U+003B	#	SEMICOLON
-#0x3C	U+003C	#	LESS-THAN SIGN
-#0x3D	U+003D	#	EQUALS SIGN
-#0x3E	U+003E	#	GREATER-THAN SIGN
-#0x3F	U+003F	#	QUESTION MARK
-#0x40	U+0040	#	COMMERCIAL AT
-#0x41	U+0041	#	LATIN CAPITAL LETTER A
-#0x42	U+0042	#	LATIN CAPITAL LETTER B
-#0x43	U+0043	#	LATIN CAPITAL LETTER C
-#0x44	U+0044	#	LATIN CAPITAL LETTER D
-#0x45	U+0045	#	LATIN CAPITAL LETTER E
-#0x46	U+0046	#	LATIN CAPITAL LETTER F
-#0x47	U+0047	#	LATIN CAPITAL LETTER G
-#0x48	U+0048	#	LATIN CAPITAL LETTER H
-#0x49	U+0049	#	LATIN CAPITAL LETTER I
-#0x4A	U+004A	#	LATIN CAPITAL LETTER J
-#0x4B	U+004B	#	LATIN CAPITAL LETTER K
-#0x4C	U+004C	#	LATIN CAPITAL LETTER L
-#0x4D	U+004D	#	LATIN CAPITAL LETTER M
-#0x4E	U+004E	#	LATIN CAPITAL LETTER N
-#0x4F	U+004F	#	LATIN CAPITAL LETTER O
-#0x50	U+0050	#	LATIN CAPITAL LETTER P
-#0x51	U+0051	#	LATIN CAPITAL LETTER Q
-#0x52	U+0052	#	LATIN CAPITAL LETTER R
-#0x53	U+0053	#	LATIN CAPITAL LETTER S
-#0x54	U+0054	#	LATIN CAPITAL LETTER T
-#0x55	U+0055	#	LATIN CAPITAL LETTER U
-#0x56	U+0056	#	LATIN CAPITAL LETTER V
-#0x57	U+0057	#	LATIN CAPITAL LETTER W
-#0x58	U+0058	#	LATIN CAPITAL LETTER X
-#0x59	U+0059	#	LATIN CAPITAL LETTER Y
-#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
-#0x5B	U+005B	#	LEFT SQUARE BRACKET
-#0x5C	U+005C	#	REVERSE SOLIDUS
-#0x5D	U+005D	#	RIGHT SQUARE BRACKET
-#0x5E	U+005E	#	CIRCUMFLEX ACCENT
-#0x5F	U+005F	#	LOW LINE
-#0x60	U+0060	#	GRAVE ACCENT
-#0x61	U+0061	#	LATIN SMALL LETTER A
-#0x62	U+0062	#	LATIN SMALL LETTER B
-#0x63	U+0063	#	LATIN SMALL LETTER C
-#0x64	U+0064	#	LATIN SMALL LETTER D
-#0x65	U+0065	#	LATIN SMALL LETTER E
-#0x66	U+0066	#	LATIN SMALL LETTER F
-#0x67	U+0067	#	LATIN SMALL LETTER G
-#0x68	U+0068	#	LATIN SMALL LETTER H
-#0x69	U+0069	#	LATIN SMALL LETTER I
-#0x6A	U+006A	#	LATIN SMALL LETTER J
-#0x6B	U+006B	#	LATIN SMALL LETTER K
-#0x6C	U+006C	#	LATIN SMALL LETTER L
-#0x6D	U+006D	#	LATIN SMALL LETTER M
-#0x6E	U+006E	#	LATIN SMALL LETTER N
-#0x6F	U+006F	#	LATIN SMALL LETTER O
-#0x70	U+0070	#	LATIN SMALL LETTER P
-#0x71	U+0071	#	LATIN SMALL LETTER Q
-#0x72	U+0072	#	LATIN SMALL LETTER R
-#0x73	U+0073	#	LATIN SMALL LETTER S
-#0x74	U+0074	#	LATIN SMALL LETTER T
-#0x75	U+0075	#	LATIN SMALL LETTER U
-#0x76	U+0076	#	LATIN SMALL LETTER V
-#0x77	U+0077	#	LATIN SMALL LETTER W
-#0x78	U+0078	#	LATIN SMALL LETTER X
-#0x79	U+0079	#	LATIN SMALL LETTER Y
-#0x7A	U+007A	#	LATIN SMALL LETTER Z
-#0x7B	U+007B	#	LEFT CURLY BRACKET
-#0x7C	U+007C	#	VERTICAL LINE
-#0x7D	U+007D	#	RIGHT CURLY BRACKET
-#0x7E	U+007E	#	TILDE
-
-0xA0	U+00A0	#	NO-BREAK SPACE
-0xA1	U+00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
-0xA2	U+00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xA3	U+00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
-0xA4	U+00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xA5	U+00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
-0xA6	U+00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xA7	U+00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
-0xA8	U+00B4	#	ACUTE ACCENT
-0xA9	U+02CB	#	MODIFIER LETTER GRAVE ACCENT
-0xAA	U+02C6	#	MODIFIER LETTER CIRCUMFLEX ACCENT
-0xAB	U+00A8	#	DIAERESIS
-0xAC	U+02DC	#	SMALL TILDE
-0xAD	U+00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
-0xAE	U+00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xAF	U+20A4	#	LIRA SIGN
-0xB0	U+00AF	#	MACRON
-0xB1	U+00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
-0xB2	U+00FD	#	LATIN SMALL LETTER Y WITH ACUTE
-0xB3	U+00B0	#	DEGREE SIGN
-0xB4	U+00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
-0xB5	U+00E7	#	LATIN SMALL LETTER C WITH CEDILLA
-0xB6	U+00D1	#	LATIN CAPITAL LETTER N WITH TILDE
-0xB7	U+00F1	#	LATIN SMALL LETTER N WITH TILDE
-0xB8	U+00A1	#	INVERTED EXCLAMATION MARK
-0xB9	U+00BF	#	INVERTED QUESTION MARK
-0xBA	U+00A4	#	CURRENCY SIGN
-0xBB	U+00A3	#	POUND SIGN
-0xBC	U+00A5	#	YEN SIGN
-0xBD	U+00A7	#	SECTION SIGN
-0xBE	U+0192	#	LATIN SMALL LETTER F WITH HOOK
-0xBF	U+00A2	#	CENT SIGN
-0xC0	U+00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xC1	U+00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
-0xC2	U+00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xC3	U+00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xC4	U+00E1	#	LATIN SMALL LETTER A WITH ACUTE
-0xC5	U+00E9	#	LATIN SMALL LETTER E WITH ACUTE
-0xC6	U+00F3	#	LATIN SMALL LETTER O WITH ACUTE
-0xC7	U+00FA	#	LATIN SMALL LETTER U WITH ACUTE
-0xC8	U+00E0	#	LATIN SMALL LETTER A WITH GRAVE
-0xC9	U+00E8	#	LATIN SMALL LETTER E WITH GRAVE
-0xCA	U+00F2	#	LATIN SMALL LETTER O WITH GRAVE
-0xCB	U+00F9	#	LATIN SMALL LETTER U WITH GRAVE
-0xCC	U+00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
-0xCD	U+00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
-0xCE	U+00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
-0xCF	U+00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
-0xD0	U+00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
-0xD1	U+00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xD2	U+00D8	#	LATIN CAPITAL LETTER O WITH STROKE
-0xD3	U+00C6	#	LATIN CAPITAL LETTER AE
-0xD4	U+00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
-0xD5	U+00ED	#	LATIN SMALL LETTER I WITH ACUTE
-0xD6	U+00F8	#	LATIN SMALL LETTER O WITH STROKE
-0xD7	U+00E6	#	LATIN SMALL LETTER AE
-0xD8	U+00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
-0xD9	U+00EC	#	LATIN SMALL LETTER I WITH GRAVE
-0xDA	U+00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
-0xDB	U+00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDC	U+00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
-0xDD	U+00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
-0xDE	U+00DF	#	LATIN SMALL LETTER SHARP S
-0xDF	U+00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xE0	U+00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
-0xE1	U+00C3	#	LATIN CAPITAL LETTER A WITH TILDE
-0xE2	U+00E3	#	LATIN SMALL LETTER A WITH TILDE
-0xE3	U+00D0	#	LATIN CAPITAL LETTER ETH
-0xE4	U+00F0	#	LATIN SMALL LETTER ETH
-0xE5	U+00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
-0xE6	U+00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
-0xE7	U+00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
-0xE8	U+00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
-0xE9	U+00D5	#	LATIN CAPITAL LETTER O WITH TILDE
-0xEA	U+00F5	#	LATIN SMALL LETTER O WITH TILDE
-0xEB	U+0160	#	LATIN CAPITAL LETTER S WITH CARON
-0xEC	U+0161	#	LATIN SMALL LETTER S WITH CARON
-0xED	U+00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
-0xEE	U+0178	#	LATIN CAPITAL LETTER Y WITH DIAERESIS
-0xEF	U+00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
-0xF0	U+00DE	#	LATIN CAPITAL LETTER THORN
-0xF1	U+00FE	#	LATIN SMALL LETTER THORN
-0xF2	U+00B7	#	MIDDLE DOT
-0xF3	U+00B5	#	MICRO SIGN
-0xF4	U+00B6	#	PILCROW SIGN
-0xF5	U+00BE	#	VULGAR FRACTION THREE QUARTERS
-0xF6	U+2014	#	EM DASH
-0xF7	U+00BC	#	VULGAR FRACTION ONE QUARTER
-0xF8	U+00BD	#	VULGAR FRACTION ONE HALF
-0xF9	U+00AA	#	FEMININE ORDINAL INDICATOR
-0xFA	U+00BA	#	MASCULINE ORDINAL INDICATOR
-0xFB	U+00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xFC	U+25A0	#	BLACK SQUARE
-0xFD	U+00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xFE	U+00B1	#	PLUS-MINUS SIGN
-
-## EOF ##
diff --git a/src/chrtrans/iso15_uni.tbl b/src/chrtrans/iso15_uni.tbl
deleted file mode 100644
index efb5bf23..00000000
--- a/src/chrtrans/iso15_uni.tbl
+++ /dev/null
@@ -1,216 +0,0 @@
-# The MIME name of this charset.
-Miso-8859-15
-
-# Name as a Display Charset (used on Options screen)
-OWestern (ISO-8859-15)
-
-# This is not the default font!
-D0
-
-#Codepage number
-#?
-
-#
-# Name:		ISO 8859-15 Latin 9 (1998) to Unicode
-# Date:		1999-01-01
-# Authors:	Christian "naddy" Weisgerber <naddy@mips.rhein-neckar.de>
-#
-# Remarks:	Latin 9 is identical to Latin 1	except for
-#		code positions A4, A6, A8, B4, B8, BC, BD, BE
-
-0x20-0x7E idem	#	ASCII
-
-#0x20	U+0020	#	SPACE
-#0x21	U+0021	#	EXCLAMATION MARK
-#0x22	U+0022	#	QUOTATION MARK
-#0x23	U+0023	#	NUMBER SIGN
-#0x24	U+0024	#	DOLLAR SIGN
-#0x25	U+0025	#	PERCENT SIGN
-#0x26	U+0026	#	AMPERSAND
-#0x27	U+0027	#	APOSTROPHE
-#0x28	U+0028	#	LEFT PARENTHESIS
-#0x29	U+0029	#	RIGHT PARENTHESIS
-#0x2A	U+002A	#	ASTERISK
-#0x2B	U+002B	#	PLUS SIGN
-#0x2C	U+002C	#	COMMA
-#0x2D	U+002D	#	HYPHEN-MINUS
-#0x2E	U+002E	#	FULL STOP
-#0x2F	U+002F	#	SOLIDUS
-#0x30	U+0030	#	DIGIT ZERO
-#0x31	U+0031	#	DIGIT ONE
-#0x32	U+0032	#	DIGIT TWO
-#0x33	U+0033	#	DIGIT THREE
-#0x34	U+0034	#	DIGIT FOUR
-#0x35	U+0035	#	DIGIT FIVE
-#0x36	U+0036	#	DIGIT SIX
-#0x37	U+0037	#	DIGIT SEVEN
-#0x38	U+0038	#	DIGIT EIGHT
-#0x39	U+0039	#	DIGIT NINE
-#0x3A	U+003A	#	COLON
-#0x3B	U+003B	#	SEMICOLON
-#0x3C	U+003C	#	LESS-THAN SIGN
-#0x3D	U+003D	#	EQUALS SIGN
-#0x3E	U+003E	#	GREATER-THAN SIGN
-#0x3F	U+003F	#	QUESTION MARK
-#0x40	U+0040	#	COMMERCIAL AT
-#0x41	U+0041	#	LATIN CAPITAL LETTER A
-#0x42	U+0042	#	LATIN CAPITAL LETTER B
-#0x43	U+0043	#	LATIN CAPITAL LETTER C
-#0x44	U+0044	#	LATIN CAPITAL LETTER D
-#0x45	U+0045	#	LATIN CAPITAL LETTER E
-#0x46	U+0046	#	LATIN CAPITAL LETTER F
-#0x47	U+0047	#	LATIN CAPITAL LETTER G
-#0x48	U+0048	#	LATIN CAPITAL LETTER H
-#0x49	U+0049	#	LATIN CAPITAL LETTER I
-#0x4A	U+004A	#	LATIN CAPITAL LETTER J
-#0x4B	U+004B	#	LATIN CAPITAL LETTER K
-#0x4C	U+004C	#	LATIN CAPITAL LETTER L
-#0x4D	U+004D	#	LATIN CAPITAL LETTER M
-#0x4E	U+004E	#	LATIN CAPITAL LETTER N
-#0x4F	U+004F	#	LATIN CAPITAL LETTER O
-#0x50	U+0050	#	LATIN CAPITAL LETTER P
-#0x51	U+0051	#	LATIN CAPITAL LETTER Q
-#0x52	U+0052	#	LATIN CAPITAL LETTER R
-#0x53	U+0053	#	LATIN CAPITAL LETTER S
-#0x54	U+0054	#	LATIN CAPITAL LETTER T
-#0x55	U+0055	#	LATIN CAPITAL LETTER U
-#0x56	U+0056	#	LATIN CAPITAL LETTER V
-#0x57	U+0057	#	LATIN CAPITAL LETTER W
-#0x58	U+0058	#	LATIN CAPITAL LETTER X
-#0x59	U+0059	#	LATIN CAPITAL LETTER Y
-#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
-#0x5B	U+005B	#	LEFT SQUARE BRACKET
-#0x5C	U+005C	#	REVERSE SOLIDUS
-#0x5D	U+005D	#	RIGHT SQUARE BRACKET
-#0x5E	U+005E	#	CIRCUMFLEX ACCENT
-#0x5F	U+005F	#	LOW LINE
-#0x60	U+0060	#	GRAVE ACCENT
-#0x61	U+0061	#	LATIN SMALL LETTER A
-#0x62	U+0062	#	LATIN SMALL LETTER B
-#0x63	U+0063	#	LATIN SMALL LETTER C
-#0x64	U+0064	#	LATIN SMALL LETTER D
-#0x65	U+0065	#	LATIN SMALL LETTER E
-#0x66	U+0066	#	LATIN SMALL LETTER F
-#0x67	U+0067	#	LATIN SMALL LETTER G
-#0x68	U+0068	#	LATIN SMALL LETTER H
-#0x69	U+0069	#	LATIN SMALL LETTER I
-#0x6A	U+006A	#	LATIN SMALL LETTER J
-#0x6B	U+006B	#	LATIN SMALL LETTER K
-#0x6C	U+006C	#	LATIN SMALL LETTER L
-#0x6D	U+006D	#	LATIN SMALL LETTER M
-#0x6E	U+006E	#	LATIN SMALL LETTER N
-#0x6F	U+006F	#	LATIN SMALL LETTER O
-#0x70	U+0070	#	LATIN SMALL LETTER P
-#0x71	U+0071	#	LATIN SMALL LETTER Q
-#0x72	U+0072	#	LATIN SMALL LETTER R
-#0x73	U+0073	#	LATIN SMALL LETTER S
-#0x74	U+0074	#	LATIN SMALL LETTER T
-#0x75	U+0075	#	LATIN SMALL LETTER U
-#0x76	U+0076	#	LATIN SMALL LETTER V
-#0x77	U+0077	#	LATIN SMALL LETTER W
-#0x78	U+0078	#	LATIN SMALL LETTER X
-#0x79	U+0079	#	LATIN SMALL LETTER Y
-#0x7A	U+007A	#	LATIN SMALL LETTER Z
-#0x7B	U+007B	#	LEFT CURLY BRACKET
-#0x7C	U+007C	#	VERTICAL LINE
-#0x7D	U+007D	#	RIGHT CURLY BRACKET
-#0x7E	U+007E	#	TILDE
-
-0xA0	U+00A0	#	NO-BREAK SPACE
-0xA1	U+00A1	#	INVERTED EXCLAMATION MARK
-0xA2	U+00A2	#	CENT SIGN
-0xA3	U+00A3	#	POUND SIGN
-0xA4	U+20AC	#	EURO SIGN
-0xA5	U+00A5	#	YEN SIGN
-0xA6	U+0160	#	LATIN CAPITAL LETTER S WITH CARON
-0xA7	U+00A7	#	SECTION SIGN
-0xA8	U+0161	#	LATIN SMALL LETTER S WITH CARON
-0xA9	U+00A9	#	COPYRIGHT SIGN
-0xAA	U+00AA	#	FEMININE ORDINAL INDICATOR
-0xAB	U+00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xAC	U+00AC	#	NOT SIGN
-0xAD	U+00AD	#	SOFT HYPHEN
-0xAE	U+00AE	#	REGISTERED SIGN
-0xAF	U+00AF	#	MACRON
-0xB0	U+00B0	#	DEGREE SIGN
-0xB1	U+00B1	#	PLUS-MINUS SIGN
-0xB2	U+00B2	#	SUPERSCRIPT TWO
-0xB3	U+00B3	#	SUPERSCRIPT THREE
-0xB4	U+017D	#	LATIN CAPITAL LETTER Z WITH CARON
-0xB5	U+00B5	#	MICRO SIGN
-0xB6	U+00B6	#	PILCROW SIGN
-0xB7	U+00B7	#	MIDDLE DOT
-0xB8	U+017D	#	LATIN SMALL LETTER Z WITH CARON
-0xB9	U+00B9	#	SUPERSCRIPT ONE
-0xBA	U+00BA	#	MASCULINE ORDINAL INDICATOR
-0xBB	U+00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xBC	U+0152	#	LATIN CAPITAL LIGATURE OE
-0xBD	U+0153	#	LATIN SMALL LIGATURE OE
-0xBE	U+0178	#	LATIN CAPITAL LETTER Y WITH DIAERESIS
-0xBF	U+00BF	#	INVERTED QUESTION MARK
-0xC0	U+00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
-0xC1	U+00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
-0xC2	U+00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-0xC3	U+00C3	#	LATIN CAPITAL LETTER A WITH TILDE
-0xC4	U+00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
-0xC5	U+00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
-0xC6	U+00C6	#	LATIN CAPITAL LETTER AE
-0xC7	U+00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
-0xC8	U+00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
-0xC9	U+00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
-0xCA	U+00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-0xCB	U+00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
-0xCC	U+00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
-0xCD	U+00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
-0xCE	U+00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-0xCF	U+00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
-0xD0	U+00D0	#	LATIN CAPITAL LETTER ETH
-0xD1	U+00D1	#	LATIN CAPITAL LETTER N WITH TILDE
-0xD2	U+00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
-0xD3	U+00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
-0xD4	U+00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-0xD5	U+00D5	#	LATIN CAPITAL LETTER O WITH TILDE
-0xD6	U+00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
-0xD7	U+00D7	#	MULTIPLICATION SIGN
-0xD8	U+00D8	#	LATIN CAPITAL LETTER O WITH STROKE
-0xD9	U+00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
-0xDA	U+00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
-0xDB	U+00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-0xDC	U+00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
-0xDD	U+00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
-0xDE	U+00DE	#	LATIN CAPITAL LETTER THORN
-0xDF	U+00DF	#	LATIN SMALL LETTER SHARP S
-0xE0	U+00E0	#	LATIN SMALL LETTER A WITH GRAVE
-0xE1	U+00E1	#	LATIN SMALL LETTER A WITH ACUTE
-0xE2	U+00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
-0xE3	U+00E3	#	LATIN SMALL LETTER A WITH TILDE
-0xE4	U+00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
-0xE5	U+00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
-0xE6	U+00E6	#	LATIN SMALL LETTER AE
-0xE7	U+00E7	#	LATIN SMALL LETTER C WITH CEDILLA
-0xE8	U+00E8	#	LATIN SMALL LETTER E WITH GRAVE
-0xE9	U+00E9	#	LATIN SMALL LETTER E WITH ACUTE
-0xEA	U+00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
-0xEB	U+00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
-0xEC	U+00EC	#	LATIN SMALL LETTER I WITH GRAVE
-0xED	U+00ED	#	LATIN SMALL LETTER I WITH ACUTE
-0xEE	U+00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
-0xEF	U+00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
-0xF0	U+00F0	#	LATIN SMALL LETTER ETH
-0xF1	U+00F1	#	LATIN SMALL LETTER N WITH TILDE
-0xF2	U+00F2	#	LATIN SMALL LETTER O WITH GRAVE
-0xF3	U+00F3	#	LATIN SMALL LETTER O WITH ACUTE
-0xF4	U+00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
-0xF5	U+00F5	#	LATIN SMALL LETTER O WITH TILDE
-0xF6	U+00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
-0xF7	U+00F7	#	DIVISION SIGN
-0xF8	U+00F8	#	LATIN SMALL LETTER O WITH STROKE
-0xF9	U+00F9	#	LATIN SMALL LETTER U WITH GRAVE
-0xFA	U+00FA	#	LATIN SMALL LETTER U WITH ACUTE
-0xFB	U+00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
-0xFC	U+00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
-0xFD	U+00FD	#	LATIN SMALL LETTER Y WITH ACUTE
-0xFE	U+00FE	#	LATIN SMALL LETTER THORN
-0xFF	U+00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
-
-## EOF ##
diff --git a/src/chrtrans/koi8u_uni.tbl b/src/chrtrans/koi8u_uni.tbl
deleted file mode 100644
index 2c13845b..00000000
--- a/src/chrtrans/koi8u_uni.tbl
+++ /dev/null
@@ -1,154 +0,0 @@
-# Options screen name for this character set
-OUkrainian Cyrillic (KOI8-U)
-
-# MIME name for this charset
-Mkoi8-u
-
-#Codepage number
-#?
-
-0x20-0x7f       idem
-# Based on a table received from "Denis V. Dmitrienko" <denis@null.net>
-# (verified against RFC2319).
-# KOI8-U home page: <http://www.net.ua/KOI8-U>
-#
-# Quoted from RFC2319:
-#   The upper part of the KOI8-U Character Set contains all Russian
-#   letters defined in KOI8-R and four Ukrainian letters (#164, #180 -
-#   ukr. ie, #166, #182 - ukr. i, #167, #183 - ukr. yi, #173, #189 - ukr.
-#   ghe  with upturn) which locations are compliant with ISO-IR-111.
-#
-#   BOX DRAWINGS elements in the other positions (that are not used by
-#   Ukrainian letters) are the same as in KOI8-R character set.
-#
-#
-#hex unicode # description
-#--- U+---- # ---------------
-0x80 U+2500 # BOX DRAWINGS  LIGHT HORIZONTAL
-0x81 U+2502 # BOX DRAWINGS  LIGHT VERTICAL
-0x82 U+250C # BOX DRAWINGS  LIGHT DOWN AND RIGHT
-0x83 U+2510 # BOX DRAWINGS  LIGHT DOWN AND LEFT
-0x84 U+2514 # BOX DRAWINGS  LIGHT UP AND RIGHT
-0x85 U+2518 # BOX DRAWINGS  LIGHT UP AND LEFT
-0x86 U+251C # BOX DRAWINGS  LIGHT VERTICAL AND RIGHT
-0x87 U+2524 # BOX DRAWINGS  LIGHT VERTICAL AND LEFT
-0x88 U+252C # BOX DRAWINGS  LIGHT DOWN AND HORIZONTAL
-0x89 U+2534 # BOX DRAWINGS  LIGHT UP AND HORIZONTAL
-0x8A U+253C # BOX DRAWINGS  LIGHT VERTICAL AND HORIZONTAL
-0x8B U+2580 # UPPER HALF BLOCK
-0x8C U+2584 # LOWER HALF BLOCK
-0x8D U+2588 # FULL BLOCK
-0x8E U+258C # LEFT HALF BLOCK
-0x8F U+2590 # RIGHT HALF BLOCK
-0x90 U+2591 # LIGHT SHADE
-0x91 U+2592 # MEDIUM SHADE
-0x92 U+2593 # DARK SHADE
-0x93 U+2320 # TOP HALF INTEGRAL
-0x94 U+25A0 # BLACK SQUARE
-0x95 U+2219 # BULLET OPERATOR
-0x96 U+221A # SQUARE ROOT
-0x97 U+2248 # ALMOST EQUAL TO
-0x98 U+2264 # LESS THAN OR EQUAL TO
-0x99 U+2265 # GREATER THAN OR EQUAL TO
-0x9A U+00A0 # NO-BREAK SPACE
-0x9B U+2321 # BOTTOM HALF INTEGRAL
-0x9C U+00B0 # DEGREE SIGN
-0x9D U+00B2 # SUPERSCRIPT TWO
-0x9E U+00B7 # MIDDLE DOT
-0x9F U+00F7 # DIVISION SIGN
-0xA0 U+2550 # BOX DRAWINGS  DOUBLE HORIZONTAL
-0xA1 U+2551 # BOX DRAWINGS  DOUBLE VERTICAL
-0xA2 U+2552 # BOX DRAWINGS  DOWN SINGLE AND RIGHT DOUBLE
-0xA3 U+0451 # CYRILLIC SMALL LETTER IO
-0xA4 U+0454 # CYRILLIC SMALL LETTER UKRAINIAN IE
-0xA5 U+2554 # BOX DRAWINGS  DOUBLE DOWN AND RIGHT
-0xA6 U+0456 # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-0xA7 U+0457 # CYRILLIC SMALL LETTER YI (UKRAINIAN)
-0xA8 U+2557 # BOX DRAWINGS  DOUBLE DOWN AND LEFT
-0xA9 U+2558 # BOX DRAWINGS  UP SINGLE AND RIGHT DOUBLE
-0xAA U+2559 # BOX DRAWINGS  UP DOUBLE AND RIGHT SINGLE
-0xAB U+255A # BOX DRAWINGS  DOUBLE UP AND RIGHT
-0xAC U+255B # BOX DRAWINGS  UP SINGLE AND LEFT DOUBLE
-0xAD U+0491 # CYRILLIC SMALL LETTER GHE WITH UPTURN
-0xAE U+255D # BOX DRAWINGS  DOUBLE UP AND LEFT
-0xAF U+255E # BOX DRAWINGS  VERTICAL SINGLE AND RIGHT DOUBLE
-0xB0 U+255F # BOX DRAWINGS  VERTICAL DOUBLE AND RIGHT SINGLE
-0xB1 U+2560 # BOX DRAWINGS  DOUBLE VERTICAL AND RIGHT
-0xB2 U+2561 # BOX DRAWINGS  VERTICAL SINGLE AND LEFT DOUBLE
-0xB3 U+0401 # CYRILLIC CAPITAL LETTER IO
-0xB4 U+0404 # CYRILLIC CAPITAL LETTER UKRAINIAN IE
-0xB5 U+2563 # BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-0xB6 U+0406 # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
-0xB7 U+0407 # CYRILLIC CAPITAL LETTER YI (UKRAINIAN)
-0xB8 U+2566 # BOX DRAWINGS  DOUBLE DOWN AND HORIZONTAL
-0xB9 U+2567 # BOX DRAWINGS  UP SINGLE AND HORIZONTAL DOUBLE
-0xBA U+2568 # BOX DRAWINGS  UP DOUBLE AND HORIZONTAL SINGLE
-0xBB U+2569 # BOX DRAWINGS  DOUBLE UP AND HORIZONTAL
-0xBC U+256A # BOX DRAWINGS  VERTICAL SINGLE AND HORIZONTAL DOUBLE
-0xBD U+0490 # CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-0xBE U+256C # BOX DRAWINGS  DOUBLE VERTICAL AND HORIZONTAL
-0xBF U+00A9 # COPYRIGHT SIGN
-0xC0 U+044E # CYRILLIC SMALL LETTER YU
-0xC1 U+0430 # CYRILLIC SMALL LETTER A
-0xC2 U+0431 # CYRILLIC SMALL LETTER BE
-0xC3 U+0446 # CYRILLIC SMALL LETTER TSE
-0xC4 U+0434 # CYRILLIC SMALL LETTER DE
-0xC5 U+0435 # CYRILLIC SMALL LETTER IE
-0xC6 U+0444 # CYRILLIC SMALL LETTER EF
-0xC7 U+0433 # CYRILLIC SMALL LETTER GHE
-0xC8 U+0445 # CYRILLIC SMALL LETTER KHA
-0xC9 U+0438 # CYRILLIC SMALL LETTER I
-0xCA U+0439 # CYRILLIC SMALL LETTER SHORT I
-0xCB U+043A # CYRILLIC SMALL LETTER KA
-0xCC U+043B # CYRILLIC SMALL LETTER EL
-0xCD U+043C # CYRILLIC SMALL LETTER EM
-0xCE U+043D # CYRILLIC SMALL LETTER EN
-0xCF U+043E # CYRILLIC SMALL LETTER O
-0xD0 U+043F # CYRILLIC SMALL LETTER PE
-0xD1 U+044F # CYRILLIC SMALL LETTER YA
-0xD2 U+0440 # CYRILLIC SMALL LETTER ER
-0xD3 U+0441 # CYRILLIC SMALL LETTER ES
-0xD4 U+0442 # CYRILLIC SMALL LETTER TE
-0xD5 U+0443 # CYRILLIC SMALL LETTER U
-0xD6 U+0436 # CYRILLIC SMALL LETTER ZHE
-0xD7 U+0432 # CYRILLIC SMALL LETTER VE
-0xD8 U+044C # CYRILLIC SMALL LETTER SOFT SIGN
-0xD9 U+044B # CYRILLIC SMALL LETTER YERU
-0xDA U+0437 # CYRILLIC SMALL LETTER ZE
-0xDB U+0448 # CYRILLIC SMALL LETTER SHA
-0xDC U+044D # CYRILLIC SMALL LETTER E
-0xDD U+0449 # CYRILLIC SMALL LETTER SHCHA
-0xDE U+0447 # CYRILLIC SMALL LETTER CHE
-0xDF U+044A # CYRILLIC SMALL LETTER HARD SIGN
-0xE0 U+042E # CYRILLIC CAPITAL LETTER YU
-0xE1 U+0410 # CYRILLIC CAPITAL LETTER A
-0xE2 U+0411 # CYRILLIC CAPITAL LETTER BE
-0xE3 U+0426 # CYRILLIC CAPITAL LETTER TSE
-0xE4 U+0414 # CYRILLIC CAPITAL LETTER DE
-0xE5 U+0415 # CYRILLIC CAPITAL LETTER IE
-0xE6 U+0424 # CYRILLIC CAPITAL LETTER EF
-0xE7 U+0413 # CYRILLIC CAPITAL LETTER GHE
-0xE8 U+0425 # CYRILLIC CAPITAL LETTER KHA
-0xE9 U+0418 # CYRILLIC CAPITAL LETTER I
-0xEA U+0419 # CYRILLIC CAPITAL LETTER SHORT I
-0xEB U+041A # CYRILLIC CAPITAL LETTER KA
-0xEC U+041B # CYRILLIC CAPITAL LETTER EL
-0xED U+041C # CYRILLIC CAPITAL LETTER EM
-0xEE U+041D # CYRILLIC CAPITAL LETTER EN
-0xEF U+041E # CYRILLIC CAPITAL LETTER O
-0xF0 U+041F # CYRILLIC CAPITAL LETTER PE
-0xF1 U+042F # CYRILLIC CAPITAL LETTER YA
-0xF2 U+0420 # CYRILLIC CAPITAL LETTER ER
-0xF3 U+0421 # CYRILLIC CAPITAL LETTER ES
-0xF4 U+0422 # CYRILLIC CAPITAL LETTER TE
-0xF5 U+0423 # CYRILLIC CAPITAL LETTER U
-0xF6 U+0416 # CYRILLIC CAPITAL LETTER ZHE
-0xF7 U+0412 # CYRILLIC CAPITAL LETTER VE
-0xF8 U+042C # CYRILLIC CAPITAL LETTER SOFT SIGN
-0xF9 U+042B # CYRILLIC CAPITAL LETTER YERU
-0xFA U+0417 # CYRILLIC CAPITAL LETTER ZE
-0xFB U+0428 # CYRILLIC CAPITAL LETTER SHA
-0xFC U+042D # CYRILLIC CAPITAL LETTER E
-0xFD U+0429 # CYRILLIC CAPITAL LETTER SHCHA
-0xFE U+0427 # CYRILLIC CAPITAL LETTER CHE
-0xFF U+042A # CYRILLIC CAPITAL LETTER HARD SIGN
diff --git a/src/chrtrans/mnem_suni.tbl b/src/chrtrans/mnem_suni.tbl
deleted file mode 100644
index 02bd8ea8..00000000
--- a/src/chrtrans/mnem_suni.tbl
+++ /dev/null
@@ -1,1861 +0,0 @@
-#The MIME name of this charset.
-Mmnem
-
-#Name as a Display Charset (used on Options screen)
-ORFC1345 Mnem
-
-# U+0020: SP
-U+0021:!
-U+0022:"
-U+0023: Nb
-U+0024: DO
-U+0025:%
-U+0026:&&
-U+0027:'
-U+0028:(
-U+0029:)
-U+002a:*
-U+002b:+
-U+002c:,
-U+002d:-
-U+002e:.
-U+002f:/
-U+0030:0
-U+0031:1
-U+0032:2
-U+0033:3
-U+0034:4
-U+0035:5
-U+0036:6
-U+0037:7
-U+0038:8
-U+0039:9
-U+003a::
-U+003b:;
-U+003c:<
-U+003d:=
-U+003e:>
-U+003f:?
-U+0040: At
-U+0041:A
-U+0042:B
-U+0043:C
-U+0044:D
-U+0045:E
-U+0046:F
-U+0047:G
-U+0048:H
-U+0049:I
-U+004a:J
-U+004b:K
-U+004c:L
-U+004d:M
-U+004e:N
-U+004f:O
-U+0050:P
-U+0051:Q
-U+0052:R
-U+0053:S
-U+0054:T
-U+0055:U
-U+0056:V
-U+0057:W
-U+0058:X
-U+0059:Y
-U+005a:Z
-U+005b: <(
-U+005c: //
-U+005d: )>
-U+005e: '>
-U+005f:_
-U+0060: '!
-U+0061:a
-U+0062:b
-U+0063:c
-U+0064:d
-U+0065:e
-U+0066:f
-U+0067:g
-U+0068:h
-U+0069:i
-U+006a:j
-U+006b:k
-U+006c:l
-U+006d:m
-U+006e:n
-U+006f:o
-U+0070:p
-U+0071:q
-U+0072:r
-U+0073:s
-U+0074:t
-U+0075:u
-U+0076:v
-U+0077:w
-U+0078:x
-U+0079:y
-U+007a:z
-U+007b: (!
-U+007c: !!
-U+007d: !)
-U+007e: '?
-U+00a0: NS
-U+00a1: !I
-U+00a2: Ct
-U+00a3: Pd
-U+00a4: Cu
-U+00a5: Ye
-U+00a6: BB
-U+00a7: SE
-U+00a8: ':
-U+00a9: Co
-U+00aa: -a
-U+00ab: <<
-U+00ac: NO
-U+00ad: --
-U+00ae: Rg
-U+00af: 'm
-U+00b0: DG
-U+00b1: +-
-U+00b2: 2S
-U+00b3: 3S
-U+00b4: ''
-U+00b5: My
-U+00b6: PI
-U+00b7: .M
-U+00b8: ',
-U+00b9: 1S
-U+00ba: -o
-U+00bb: >>
-U+00bc: 14
-U+00bd: 12
-U+00be: 34
-U+00bf: ?I
-U+00c0: A!
-U+00c1: A'
-U+00c2: A>
-U+00c3: A?
-U+00c4: A:
-U+00c5: AA
-U+00c6: AE
-U+00c7: C,
-U+00c8: E!
-U+00c9: E'
-U+00ca: E>
-U+00cb: E:
-U+00cc: I!
-U+00cd: I'
-U+00ce: I>
-U+00cf: I:
-U+00d0: D-
-U+00d1: N?
-U+00d2: O!
-U+00d3: O'
-U+00d4: O>
-U+00d5: O?
-U+00d6: O:
-U+00d7: *X
-U+00d8: O/
-U+00d9: U!
-U+00da: U'
-U+00db: U>
-U+00dc: U:
-U+00dd: Y'
-U+00de: TH
-U+00df: ss
-U+00e0: a!
-U+00e1: a'
-U+00e2: a>
-U+00e3: a?
-U+00e4: a:
-U+00e5: aa
-U+00e6: ae
-U+00e7: c,
-U+00e8: e!
-U+00e9: e'
-U+00ea: e>
-U+00eb: e:
-U+00ec: i!
-U+00ed: i'
-U+00ee: i>
-U+00ef: i:
-U+00f0: d-
-U+00f1: n?
-U+00f2: o!
-U+00f3: o'
-U+00f4: o>
-U+00f5: o?
-U+00f6: o:
-U+00f7: -:
-U+00f8: o/
-U+00f9: u!
-U+00fa: u'
-U+00fb: u>
-U+00fc: u:
-U+00fd: y'
-U+00fe: th
-U+00ff: y:
-U+0100: A-
-U+0101: a-
-U+0102: A(
-U+0103: a(
-U+0104: A;
-U+0105: a;
-U+0106: C'
-U+0107: c'
-U+0108: C>
-U+0109: c>
-U+010a: C.
-U+010b: c.
-U+010c: C<
-U+010d: c<
-U+010e: D<
-U+010f: d<
-U+0110: D/
-U+0111: d/
-U+0112: E-
-U+0113: e-
-U+0114: E(
-U+0115: e(
-U+0116: E.
-U+0117: e.
-U+0118: E;
-U+0119: e;
-U+011a: E<
-U+011b: e<
-U+011c: G>
-U+011d: g>
-U+011e: G(
-U+011f: g(
-U+0120: G.
-U+0121: g.
-U+0122: G,
-U+0123: g,
-U+0124: H>
-U+0125: h>
-U+0126: H/
-U+0127: h/
-U+0128: I?
-U+0129: i?
-U+012a: I-
-U+012b: i-
-U+012c: I(
-U+012d: i(
-U+012e: I;
-U+012f: i;
-U+0130: I.
-U+0131: i.
-U+0132: IJ
-U+0133: ij
-U+0134: J>
-U+0135: j>
-U+0136: K,
-U+0137: k,
-U+0138: kk
-U+0139: L'
-U+013a: l'
-U+013b: L,
-U+013c: l,
-U+013d: L<
-U+013e: l<
-U+013f: L.
-U+0140: l.
-U+0141: L/
-U+0142: l/
-U+0143: N'
-U+0144: n'
-U+0145: N,
-U+0146: n,
-U+0147: N<
-U+0148: n<
-U+0149: 'n
-U+014a: NG
-U+014b: ng
-U+014c: O-
-U+014d: o-
-U+014e: O(
-U+014f: o(
-U+0150: O"
-U+0151: o"
-U+0152: OE
-U+0153: oe
-U+0154: R'
-U+0155: r'
-U+0156: R,
-U+0157: r,
-U+0158: R<
-U+0159: r<
-U+015a: S'
-U+015b: s'
-U+015c: S>
-U+015d: s>
-U+015e: S,
-U+015f: s,
-U+0160: S<
-U+0161: s<
-U+0162: T,
-U+0163: t,
-U+0164: T<
-U+0165: t<
-U+0166: T/
-U+0167: t/
-U+0168: U?
-U+0169: u?
-U+016a: U-
-U+016b: u-
-U+016c: U(
-U+016d: u(
-U+016e: U0
-U+016f: u0
-U+0170: U"
-U+0171: u"
-U+0172: U;
-U+0173: u;
-U+0174: W>
-U+0175: w>
-U+0176: Y>
-U+0177: y>
-U+0178: Y:
-U+0179: Z'
-U+017a: z'
-U+017b: Z.
-U+017c: z.
-U+017d: Z<
-U+017e: z<
-U+01a0: O9
-U+01a1: o9
-U+01a2: OI
-U+01a3: oi
-U+01a6: yr
-U+01af: U9
-U+01b0: u9
-U+01b5: Z/
-U+01b6: z/
-U+01b7: ED
-U+01cd: A<
-U+01ce: a<
-U+01cf: I<
-U+01d0: i<
-U+01d1: O<
-U+01d2: o<
-U+01d3: U<
-U+01d4: u<
-U+01d5: _U:-_
-U+01d6: _u:-_
-U+01d7: _U:'_
-U+01d8: _u:'_
-U+01d9: _U:<_
-U+01da: _u:<_
-U+01db: _U:!_
-U+01dc: _u:!_
-U+01de: A1
-U+01df: a1
-U+01e0: A7
-U+01e1: a7
-U+01e2: A3
-U+01e3: a3
-U+01e4: G/
-U+01e5: g/
-U+01e6: G<
-U+01e7: g<
-U+01e8: K<
-U+01e9: k<
-U+01ea: O;
-U+01eb: o;
-U+01ec: O1
-U+01ed: o1
-U+01ee: EZ
-U+01ef: ez
-U+01f0: j<
-U+01f4: G'
-U+01f5: g'
-U+01fa: _AA'_
-U+01fb: _aa'_
-U+01fc: _AE'_
-U+01fd: _ae'_
-U+01fe: _O/'_
-U+01ff: _o/'_
-U+02bf: ;S
-U+02c7: '<
-U+02d8: '(
-U+02d9: '.
-U+02da: '0
-U+02db: ';
-U+02dd: '"
-U+0386: A%
-U+0388: E%
-U+0389: Y%
-U+038a: I%
-U+038c: O%
-U+038e: U%
-U+038f: W%
-U+0390: i3
-U+0391: A*
-U+0392: B*
-U+0393: G*
-U+0394: D*
-U+0395: E*
-U+0396: Z*
-U+0397: Y*
-U+0398: H*
-U+0399: I*
-U+039a: K*
-U+039b: L*
-U+039c: M*
-U+039d: N*
-U+039e: C*
-U+039f: O*
-U+03a0: P*
-U+03a1: R*
-U+03a3: S*
-U+03a4: T*
-U+03a5: U*
-U+03a6: F*
-U+03a7: X*
-U+03a8: Q*
-U+03a9: W*
-U+03aa: J*
-U+03ab: V*
-U+03ac: a%
-U+03ad: e%
-U+03ae: y%
-U+03af: i%
-U+03b0: u3
-U+03b1: a*
-U+03b2: b*
-U+03b3: g*
-U+03b4: d*
-U+03b5: e*
-U+03b6: z*
-U+03b7: y*
-U+03b8: h*
-U+03b9: i*
-U+03ba: k*
-U+03bb: l*
-U+03bc: m*
-U+03bd: n*
-U+03be: c*
-U+03bf: o*
-U+03c0: p*
-U+03c1: r*
-U+03c2: *s
-U+03c3: s*
-U+03c4: t*
-U+03c5: u*
-U+03c6: f*
-U+03c7: x*
-U+03c8: q*
-U+03c9: w*
-U+03ca: j*
-U+03cb: v*
-U+03cc: o%
-U+03cd: u%
-U+03ce: w%
-U+03d8: 'G
-U+03d9: ,G
-U+03da: T3
-U+03db: t3
-U+03dc: M3
-U+03dd: m3
-U+03de: K3
-U+03df: k3
-U+03e0: P3
-U+03e1: p3
-U+03f4: '%
-U+03f5: j3
-U+0401: IO
-U+0402: D%
-U+0403: G%
-U+0404: IE
-U+0405: DS
-U+0406: II
-U+0407: YI
-U+0408: J%
-U+0409: LJ
-U+040a: NJ
-U+040b: Ts
-U+040c: KJ
-U+040e: V%
-U+040f: DZ
-U+0410: A=
-U+0411: B=
-U+0412: V=
-U+0413: G=
-U+0414: D=
-U+0415: E=
-U+0416: Z%
-U+0417: Z=
-U+0418: I=
-U+0419: J=
-U+041a: K=
-U+041b: L=
-U+041c: M=
-U+041d: N=
-U+041e: O=
-U+041f: P=
-U+0420: R=
-U+0421: S=
-U+0422: T=
-U+0423: U=
-U+0424: F=
-U+0425: H=
-U+0426: C=
-U+0427: C%
-U+0428: S%
-U+0429: Sc
-U+042a: ="
-U+042b: Y=
-U+042c: %"
-U+042d: JE
-U+042e: JU
-U+042f: JA
-U+0430: a=
-U+0431: b=
-U+0432: v=
-U+0433: g=
-U+0434: d=
-U+0435: e=
-U+0436: z%
-U+0437: z=
-U+0438: i=
-U+0439: j=
-U+043a: k=
-U+043b: l=
-U+043c: m=
-U+043d: n=
-U+043e: o=
-U+043f: p=
-U+0440: r=
-U+0441: s=
-U+0442: t=
-U+0443: u=
-U+0444: f=
-U+0445: h=
-U+0446: c=
-U+0447: c%
-U+0448: s%
-U+0449: sc
-U+044a: ='
-U+044b: y=
-U+044c: %'
-U+044d: je
-U+044e: ju
-U+044f: ja
-U+0451: io
-U+0452: d%
-U+0453: g%
-U+0454: ie
-U+0455: ds
-U+0456: ii
-U+0457: yi
-U+0458: j%
-U+0459: lj
-U+045a: nj
-U+045b: ts
-U+045c: kj
-U+045e: v%
-U+045f: dz
-U+0462: Y3
-U+0463: y3
-U+046a: O3
-U+046b: o3
-U+0472: F3
-U+0473: f3
-U+0474: V3
-U+0475: v3
-U+0480: C3
-U+0481: c3
-U+0490: G3
-U+0491: g3
-U+05d0: A+
-U+05d1: B+
-U+05d2: G+
-U+05d3: D+
-U+05d4: H+
-U+05d5: W+
-U+05d6: Z+
-U+05d7: X+
-U+05d8: Tj
-U+05d9: J+
-U+05da: K%
-U+05db: K+
-U+05dc: L+
-U+05dd: M%
-U+05de: M+
-U+05df: N%
-U+05e0: N+
-U+05e1: S+
-U+05e2: E+
-U+05e3: P%
-U+05e4: P+
-U+05e5: Zj
-U+05e6: ZJ
-U+05e7: Q+
-U+05e8: R+
-U+05e9: Sh
-U+05ea: T+
-U+060c: ,+
-U+061b: ;+
-U+061f: ?+
-U+0621: H'
-U+0622: aM
-U+0623: aH
-U+0624: wH
-U+0625: ah
-U+0626: yH
-U+0627: a+
-U+0628: b+
-U+0629: tm
-U+062a: t+
-U+062b: tk
-U+062c: g+
-U+062d: hk
-U+062e: x+
-U+062f: d+
-U+0630: dk
-U+0631: r+
-U+0632: z+
-U+0633: s+
-U+0634: sn
-U+0635: c+
-U+0636: dd
-U+0637: tj
-U+0638: zH
-U+0639: e+
-U+063a: i+
-U+0640: ++
-U+0641: f+
-U+0642: q+
-U+0643: k+
-U+0644: l+
-U+0645: m+
-U+0646: n+
-U+0647: h+
-U+0648: w+
-U+0649: j+
-U+064a: y+
-U+064b: :+
-U+064c: "+
-U+064d: =+
-U+064e: /+
-U+064f: '+
-U+0650: 1+
-U+0651: 3+
-U+0652: 0+
-U+0670: aS
-U+067e: p+
-U+06a4: v+
-U+06af: gf
-U+06f0: 0a
-U+06f1: 1a
-U+06f2: 2a
-U+06f3: 3a
-U+06f4: 4a
-U+06f5: 5a
-U+06f6: 6a
-U+06f7: 7a
-U+06f8: 8a
-U+06f9: 9a
-U+1e00: _A-0_
-U+1e01: _a-0_
-U+1e02: B.
-U+1e03: b.
-U+1e04: _B-._
-U+1e05: _b-._
-U+1e06: B_
-U+1e07: b_
-U+1e08: _C,'_
-U+1e09: _c,'_
-U+1e0a: D.
-U+1e0b: d.
-U+1e0c: _D-._
-U+1e0d: _d-._
-U+1e0e: D_
-U+1e0f: d_
-U+1e10: D,
-U+1e11: d,
-U+1e12: _D->_
-U+1e13: _d->_
-U+1e14: _E-!_
-U+1e15: _e-!_
-U+1e16: _E-'_
-U+1e17: _e-'_
-U+1e18: _E->_
-U+1e19: _e->_
-U+1e1a: _E-?_
-U+1e1b: _e-?_
-U+1e1c: _E,(_
-U+1e1d: _e,(_
-U+1e1e: F.
-U+1e1f: f.
-U+1e20: G-
-U+1e21: g-
-U+1e22: H.
-U+1e23: h.
-U+1e24: _H-._
-U+1e25: _h-._
-U+1e26: H:
-U+1e27: h:
-U+1e28: H,
-U+1e29: h,
-U+1e2a: _H-(_
-U+1e2b: _h-(_
-U+1e2c: _I-?_
-U+1e2d: _i-?_
-U+1e2e: _I:'_
-U+1e2f: _i:'_
-U+1e30: K'
-U+1e31: k'
-U+1e32: _K-._
-U+1e33: _k-._
-U+1e34: K_
-U+1e35: k_
-U+1e36: _L-._
-U+1e37: _l-._
-U+1e38: _L--._
-U+1e39: _l--._
-U+1e3a: L_
-U+1e3b: l_
-U+1e3c: _L->_
-U+1e3d: _l->_
-U+1e3e: M'
-U+1e3f: m'
-U+1e40: M.
-U+1e41: m.
-U+1e42: _M-._
-U+1e43: _m-._
-U+1e44: N.
-U+1e45: n.
-U+1e46: _N-._
-U+1e47: _n-._
-U+1e48: N_
-U+1e49: n_
-U+1e4a: _N->_
-U+1e4b: _N->_
-U+1e4c: _O?'_
-U+1e4d: _o?'_
-U+1e4e: _O?:_
-U+1e4f: _o?:_
-U+1e50: _O-!_
-U+1e51: _o-!_
-U+1e52: _O-'_
-U+1e53: _o-'_
-U+1e54: P'
-U+1e55: p'
-U+1e56: P.
-U+1e57: p.
-U+1e58: R.
-U+1e59: r.
-U+1e5a: _R-._
-U+1e5b: _r-._
-U+1e5c: _R--._
-U+1e5d: _r--._
-U+1e5e: R_
-U+1e5f: r_
-U+1e60: S.
-U+1e61: s.
-U+1e62: _S-._
-U+1e63: _s-._
-U+1e64: _S'._
-U+1e65: _s'._
-U+1e66: _S<._
-U+1e67: _s<._
-U+1e68: _S.-._
-U+1e69: _S.-._
-U+1e6a: T.
-U+1e6b: t.
-U+1e6c: _T-._
-U+1e6d: _t-._
-U+1e6e: T_
-U+1e6f: t_
-U+1e70: _T->_
-U+1e71: _t->_
-U+1e72: _U--:_
-U+1e73: _u--:_
-U+1e74: _U-?_
-U+1e75: _u-?_
-U+1e76: _U->_
-U+1e77: _u->_
-U+1e78: _U?'_
-U+1e79: _u?'_
-U+1e7a: _U-:_
-U+1e7b: _u-:_
-U+1e7c: V?
-U+1e7d: v?
-U+1e7e: _V-._
-U+1e7f: _v-._
-U+1e80: W!
-U+1e81: w!
-U+1e82: W'
-U+1e83: w'
-U+1e84: W:
-U+1e85: w:
-U+1e86: W.
-U+1e87: w.
-U+1e88: _W-._
-U+1e89: _w-._
-U+1e8a: X.
-U+1e8b: x.
-U+1e8c: X:
-U+1e8d: x:
-U+1e8e: Y.
-U+1e8f: y.
-U+1e90: Z>
-U+1e91: z>
-U+1e92: _Z-._
-U+1e93: _z-._
-U+1e94: Z_
-U+1e95: z_
-U+1e96: h_
-U+1e97: t:
-U+1e98: w0
-U+1e99: y0
-U+1ea0: _A-._
-U+1ea1: _a-._
-U+1ea2: A2
-U+1ea3: a2
-U+1ea4: _A>'_
-U+1ea5: _a>'_
-U+1ea6: _A>!_
-U+1ea7: _a>!_
-U+1ea8: _A>2_
-U+1ea9: _a>2_
-U+1eaa: _A>?_
-U+1eab: _a>?_
-U+1eac: _A>-._
-U+1ead: _a>-._
-U+1eae: _A('_
-U+1eaf: _a('_
-U+1eb0: _A(!_
-U+1eb1: _a(!_
-U+1eb2: _A(2_
-U+1eb3: _a(2_
-U+1eb4: _A(?_
-U+1eb5: _a(?_
-U+1eb6: _A(-._
-U+1eb7: _a(-._
-U+1eb8: _E-._
-U+1eb9: _e-._
-U+1eba: E2
-U+1ebb: e2
-U+1ebc: E?
-U+1ebd: e?
-U+1ebe: _E>'_
-U+1ebf: _e>'_
-U+1ec0: _E>!_
-U+1ec1: _e>!_
-U+1ec2: _E>2_
-U+1ec3: _e>2_
-U+1ec4: _E>?_
-U+1ec5: _e>?_
-U+1ec6: _E>-._
-U+1ec7: _e>-._
-U+1ec8: I2
-U+1ec9: i2
-U+1eca: _I-._
-U+1ecb: _i-._
-U+1ecc: _O-._
-U+1ecd: _o-._
-U+1ece: O2
-U+1ecf: o2
-U+1ed0: _O>'_
-U+1ed1: _o>'_
-U+1ed2: _O>!_
-U+1ed3: _o>!_
-U+1ed4: _O>2_
-U+1ed5: _o>2_
-U+1ed6: _O>?_
-U+1ed7: _o>?_
-U+1ed8: _O>-._
-U+1ed9: _o>-._
-U+1eda: _O9'_
-U+1edb: _o9'_
-U+1edc: _O9!_
-U+1edd: _o9!_
-U+1ede: _O92_
-U+1edf: _o92_
-U+1ee0: _O9?_
-U+1ee1: _o9?_
-U+1ee2: _O9-._
-U+1ee3: _o9-._
-U+1ee4: _U-._
-U+1ee5: _u-._
-U+1ee6: U2
-U+1ee7: u2
-U+1ee8: _U9'_
-U+1ee9: _u9'_
-U+1eea: _U9!_
-U+1eeb: _u9!_
-U+1eec: _U92_
-U+1eed: _u92_
-U+1eee: _U9?_
-U+1eef: _u9?_
-U+1ef0: _U9-._
-U+1ef1: _u9-._
-U+1ef2: Y!
-U+1ef3: y!
-U+1ef4: _Y-._
-U+1ef5: _y-._
-U+1ef6: Y2
-U+1ef7: y2
-U+1ef8: Y?
-U+1ef9: y?
-U+1f00: ;'
-U+1f01: ,'
-U+1f02: ;!
-U+1f03: ,!
-U+1f04: ?;
-U+1f05: ?,
-U+1f06: !:
-U+1f07: ?:
-U+2002: 1N
-U+2003: 1M
-U+2004: 3M
-U+2005: 4M
-U+2006: 6M
-U+2009: 1T
-U+200a: 1H
-U+2010: -1
-U+2013: -N
-U+2014: -M
-U+2015: -3
-U+2016: !2
-U+2017: =2
-U+2018: '6
-U+2019: '9
-U+201a: .9
-U+201b: 9'
-U+201c: "6
-U+201d: "9
-U+201e: :9
-U+201f: 9"
-U+2020: /-
-U+2021: /=
-U+2025: ..
-U+2030: %0
-U+2032: 1'
-U+2033: 2'
-U+2034: 3'
-U+2035: 1"
-U+2036: 2"
-U+2037: 3"
-U+2038: Ca
-U+2039: <1
-U+203a: >1
-U+203b: :X
-U+203c: _!*2_
-U+203e: '-
-U+2044: /f
-U+2070: 0S
-U+2074: 4S
-U+2075: 5S
-U+2076: 6S
-U+2077: 7S
-U+2078: 8S
-U+2079: 9S
-U+207a: +S
-U+207b: -S
-U+207c: =S
-U+207d: (S
-U+207e: )S
-U+207f: nS
-U+2080: 0s
-U+2081: 1s
-U+2082: 2s
-U+2083: 3s
-U+2084: 4s
-U+2085: 5s
-U+2086: 6s
-U+2087: 7s
-U+2088: 8s
-U+2089: 9s
-U+208a: +s
-U+208b: -s
-U+208c: =s
-U+208d: (s
-U+208e: )s
-U+20a4: Li
-U+20a7: Pt
-U+20a9: W=
-U+2103: oC
-U+2105: co
-U+2109: oF
-U+2116: N0
-U+2117: PO
-U+211e: Rx
-U+2120: SM
-U+2122: TM
-U+2126: Om
-U+212b: AO
-U+2153: 13
-U+2154: 23
-U+2155: 15
-U+2156: 25
-U+2157: 35
-U+2158: 45
-U+2159: 16
-U+215a: 56
-U+215b: 18
-U+215c: 38
-U+215d: 58
-U+215e: 78
-U+2160: 1R
-U+2161: 2R
-U+2162: 3R
-U+2163: 4R
-U+2164: 5R
-U+2165: 6R
-U+2166: 7R
-U+2167: 8R
-U+2168: 9R
-U+2169: aR
-U+216a: bR
-U+216b: cR
-U+216c: _50R_
-U+216d: _100R_
-U+216e: _500R_
-U+216f: _1000R_
-U+2170: 1r
-U+2171: 2r
-U+2172: 3r
-U+2173: 4r
-U+2174: 5r
-U+2175: 6r
-U+2176: 7r
-U+2177: 8r
-U+2178: 9r
-U+2179: ar
-U+217a: br
-U+217b: cr
-U+217c: _50r_
-U+217d: _100r_
-U+217e: _500r_
-U+217f: _1000r_
-U+2180: _1000RCD_
-U+2181: _5000R_
-U+2182: _10000R_
-U+2190: <-
-U+2191: -!
-U+2192: ->
-U+2193: -v
-U+2194: <>
-U+2195: UD
-U+2196: _<!!_
-U+2197: _//>_
-U+2198: _!!>_
-U+2199: _<//_
-U+21d0: <=
-U+21d2: =>
-U+21d4: ==
-U+2200: FA
-U+2202: dP
-U+2203: TE
-U+2205: /0
-U+2206: DE
-U+2207: NB
-U+2208: (-
-U+220b: -)
-U+220f: *P
-U+2211: +Z
-U+2212: -2
-U+2213: -+
-U+2217: *-
-U+2218: Ob
-U+2219: Sb
-U+221a: RT
-U+221d: 0(
-U+221e: 00
-U+221f: -L
-U+2220: -V
-U+2225: PP
-U+2227: AN
-U+2228: OR
-U+2229: (U
-U+222a: )U
-U+222b: In
-U+222c: DI
-U+222e: Io
-U+2234: .:
-U+2235: :.
-U+2236: :R
-U+2237: ::
-U+223c: ?1
-U+223e: CG
-U+2243: ?-
-U+2245: ?=
-U+2248: ?2
-U+224c: =?
-U+2253: HI
-U+2260: !=
-U+2261: =3
-U+2264: =<
-U+2265: >=
-U+226a: <*
-U+226b: *>
-U+226e: !<
-U+226f: !>
-U+2282: (C
-U+2283: )C
-U+2286: (_
-U+2287: )_
-U+2299: 0.
-U+229a: 02
-U+22a5: -T
-U+22c5: .P
-U+22ee: :3
-U+22ef: .3
-U+2302: Eh
-U+2308: <7
-U+2309: >7
-U+230a: 7<
-U+230b: 7>
-U+2310: NI
-U+2312: (A
-U+2315: TR
-U+2320: Iu
-U+2321: Il
-U+2329: </
-U+232a: />
-U+2423: Vs
-U+2440: 1h
-U+2441: 3h
-U+2442: 2h
-U+2443: 4h
-U+2446: 1j
-U+2447: 2j
-U+2448: 3j
-U+2449: 4j
-U+2460: _1-o_
-U+2461: _2-o_
-U+2462: _3-o_
-U+2463: _4-o_
-U+2464: _5-o_
-U+2465: _6-o_
-U+2466: _7-o_
-U+2467: _8-o_
-U+2468: _9-o_
-U+2469: _10-o_
-U+246a: _11-o_
-U+246b: _12-o_
-U+246c: _13-o_
-U+246d: _14-o_
-U+246e: _15-o_
-U+246f: _16-o_
-U+2470: _17-o_
-U+2471: _18-o_
-U+2472: _19-o_
-U+2473: _20-o_
-U+2474: _(1)_
-U+2475: _(2)_
-U+2476: _(3)_
-U+2477: _(4)_
-U+2478: _(5)_
-U+2479: _(6)_
-U+247a: _(7)_
-U+247b: _(8)_
-U+247c: _(9)_
-U+247d: _(10)_
-U+247e: _(11)_
-U+247f: _(12)_
-U+2480: _(13)_
-U+2481: _(14)_
-U+2482: _(15)_
-U+2483: _(16)_
-U+2484: _(17)_
-U+2485: _(18)_
-U+2486: _(19)_
-U+2487: _(20)_
-U+2488: 1.
-U+2489: 2.
-U+248a: 3.
-U+248b: 4.
-U+248c: 5.
-U+248d: 6.
-U+248e: 7.
-U+248f: 8.
-U+2490: 9.
-U+2491: _10._
-U+2492: _11._
-U+2493: _12._
-U+2494: _13._
-U+2495: _14._
-U+2496: _15._
-U+2497: _16._
-U+2498: _17._
-U+2499: _18._
-U+249a: _19._
-U+249b: _20._
-U+249c: _(a)_
-U+249d: _(b)_
-U+249e: _(c)_
-U+249f: _(d)_
-U+24a0: _(e)_
-U+24a1: _(f)_
-U+24a2: _(g)_
-U+24a3: _(h)_
-U+24a4: _(i)_
-U+24a5: _(j)_
-U+24a6: _(k)_
-U+24a7: _(l)_
-U+24a8: _(m)_
-U+24a9: _(n)_
-U+24aa: _(o)_
-U+24ab: _(p)_
-U+24ac: _(q)_
-U+24ad: _(r)_
-U+24ae: _(s)_
-U+24af: _(t)_
-U+24b0: _(u)_
-U+24b1: _(v)_
-U+24b2: _(w)_
-U+24b3: _(x)_
-U+24b4: _(y)_
-U+24b5: _(z)_
-U+24b6: _A-o_
-U+24b7: _B-o_
-U+24b8: _C-o_
-U+24b9: _D-o_
-U+24ba: _E-o_
-U+24bb: _F-o_
-U+24bc: _G-o_
-U+24bd: _H-o_
-U+24be: _I-o_
-U+24bf: _J-o_
-U+24c0: _K-o_
-U+24c1: _L-o_
-U+24c2: _M-o_
-U+24c3: _N-o_
-U+24c4: _O-o_
-U+24c5: _P-o_
-U+24c6: _Q-o_
-U+24c7: _R-o_
-U+24c8: _S-o_
-U+24c9: _T-o_
-U+24ca: _U-o_
-U+24cb: _V-o_
-U+24cc: _W-o_
-U+24cd: _X-o_
-U+24ce: _Y-o_
-U+24cf: _Z-o_
-U+24d0: _a-o_
-U+24d1: _b-o_
-U+24d2: _c-o_
-U+24d3: _d-o_
-U+24d4: _e-o_
-U+24d5: _f-o_
-U+24d6: _g-o_
-U+24d7: _h-o_
-U+24d8: _i-o_
-U+24d9: _j-o_
-U+24da: _k-o_
-U+24db: _l-o_
-U+24dc: _m-o_
-U+24dd: _n-o_
-U+24de: _o-o_
-U+24df: _p-o_
-U+24e0: _q-o_
-U+24e1: _r-o_
-U+24e2: _s-o_
-U+24e3: _t-o_
-U+24e4: _u-o_
-U+24e5: _v-o_
-U+24e6: _w-o_
-U+24e7: _x-o_
-U+24e8: _y-o_
-U+24e9: _z-o_
-U+24ea: _0-o_
-U+2500: hh
-U+2501: HH
-U+2502: vv
-U+2503: VV
-U+2504: 3-
-U+2505: 3_
-U+2506: 3!
-U+2507: 3/
-U+2508: 4-
-U+2509: 4_
-U+250a: 4!
-U+250b: 4/
-U+250c: dr
-U+250d: dR
-U+250e: Dr
-U+250f: DR
-U+2510: dl
-U+2511: dL
-U+2512: Dl
-U+2513: LD
-U+2514: ur
-U+2515: uR
-U+2516: Ur
-U+2517: UR
-U+2518: ul
-U+2519: uL
-U+251a: Ul
-U+251b: UL
-U+251c: vr
-U+251d: vR
-U+251e: _Udr_
-U+251f: _uDr_
-U+2520: Vr
-U+2521: _UdR_
-U+2522: _uDR_
-U+2523: VR
-U+2524: vl
-U+2525: vL
-U+2526: _Udl_
-U+2527: _uDl_
-U+2528: Vl
-U+2529: _UdL_
-U+252a: _uDL_
-U+252b: VL
-U+252c: dh
-U+252d: _dLr_
-U+252e: _dlR_
-U+252f: dH
-U+2530: Dh
-U+2531: _DLr_
-U+2532: _DlR_
-U+2533: DH
-U+2534: uh
-U+2535: _uLr_
-U+2536: _ulR_
-U+2537: uH
-U+2538: Uh
-U+2539: _ULr_
-U+253a: _UlR_
-U+253b: UH
-U+253c: vh
-U+253d: _vLr_
-U+253e: _vlR_
-U+253f: vH
-U+2540: _Udh_
-U+2541: _uDh_
-U+2542: Vh
-U+2543: _UdLr_
-U+2544: _UdlR_
-U+2545: _uDLr_
-U+2546: _uDlR_
-U+2547: _UdH_
-U+2548: _uDH_
-U+2549: _VLr_
-U+254a: _VlR_
-U+254b: VH
-U+2571: FD
-U+2572: BD
-U+2580: TB
-U+2584: LB
-U+2588: FB
-U+258c: lB
-U+2590: RB
-U+2591: .S
-U+2592: :S
-U+2593: ?S
-U+25a0: fS
-U+25a1: OS
-U+25a2: RO
-U+25a3: Rr
-U+25a4: RF
-U+25a5: RY
-U+25a6: RH
-U+25a7: RZ
-U+25a8: RK
-U+25a9: RX
-U+25aa: sB
-U+25ac: SR
-U+25ad: Or
-U+25b2: UT
-U+25b3: uT
-U+25b6: PR
-U+25b7: Tr
-U+25bc: Dt
-U+25bd: dT
-U+25c0: PL
-U+25c1: Tl
-U+25c6: Db
-U+25c7: Dw
-U+25ca: LZ
-U+25cb: 0m
-U+25ce: 0o
-U+25cf: 0M
-U+25d0: 0L
-U+25d1: 0R
-U+25d8: Sn
-U+25d9: Ic
-U+25e2: Fd
-U+25e3: Bd
-U+2605: *2
-U+2606: *1
-U+260e: _TEL_
-U+260f: _tel_
-U+261c: <H
-U+261e: >H
-U+263a: 0u
-U+263b: 0U
-U+263c: SU
-U+2640: Fm
-U+2642: Ml
-U+2660: cS
-U+2661: cH
-U+2662: cD
-U+2663: cC
-U+2664: _cS-_
-U+2665: _cH-_
-U+2666: _cD-_
-U+2667: _cC-_
-U+2669: Md
-U+266a: M8
-U+266b: M2
-U+266c: _M16_
-U+266d: Mb
-U+266e: Mx
-U+266f: MX
-U+2713: OK
-U+2717: XX
-U+2720: -X
-U+3000: IS
-U+3001: ,_
-U+3002: ._
-U+3003: +"
-U+3004: +_
-U+3005: *_
-U+3006: ;_
-U+3007: 0_
-U+300a: <+
-U+300b: >+
-U+300c: <'
-U+300d: >'
-U+300e: <"
-U+300f: >"
-U+3010: ("
-U+3011: )"
-U+3012: =T
-U+3013: =_
-U+3014: ('
-U+3015: )'
-U+3016: (I
-U+3017: )I
-U+301c: -?
-U+3020: _=T:)_
-U+3041: A5
-U+3042: a5
-U+3043: I5
-U+3044: i5
-U+3045: U5
-U+3046: u5
-U+3047: E5
-U+3048: e5
-U+3049: O5
-U+304a: o5
-U+304b: ka
-U+304c: ga
-U+304d: ki
-U+304e: gi
-U+304f: ku
-U+3050: gu
-U+3051: ke
-U+3052: ge
-U+3053: ko
-U+3054: go
-U+3055: sa
-U+3056: za
-U+3057: si
-U+3058: zi
-U+3059: su
-U+305a: zu
-U+305b: se
-U+305c: ze
-U+305d: so
-U+305e: zo
-U+305f: ta
-U+3060: da
-U+3061: ti
-U+3062: di
-U+3063: tU
-U+3064: tu
-U+3065: du
-U+3066: te
-U+3067: de
-U+3068: to
-U+3069: do
-U+306a: na
-U+306b: ni
-U+306c: nu
-U+306d: ne
-U+306e: no
-U+306f: ha
-U+3070: ba
-U+3071: pa
-U+3072: hi
-U+3073: bi
-U+3074: pi
-U+3075: hu
-U+3076: bu
-U+3077: pu
-U+3078: he
-U+3079: be
-U+307a: pe
-U+307b: ho
-U+307c: bo
-U+307d: po
-U+307e: ma
-U+307f: mi
-U+3080: mu
-U+3081: me
-U+3082: mo
-U+3083: yA
-U+3084: ya
-U+3085: yU
-U+3086: yu
-U+3087: yO
-U+3088: yo
-U+3089: ra
-U+308a: ri
-U+308b: ru
-U+308c: re
-U+308d: ro
-U+308e: wA
-U+308f: wa
-U+3090: wi
-U+3091: we
-U+3092: wo
-U+3093: n5
-U+3094: vu
-U+309b: "5
-U+309c: 05
-U+309d: *5
-U+309e: +5
-U+30a1: a6
-U+30a2: A6
-U+30a3: i6
-U+30a4: I6
-U+30a5: u6
-U+30a6: U6
-U+30a7: e6
-U+30a8: E6
-U+30a9: o6
-U+30aa: O6
-U+30ab: Ka
-U+30ac: Ga
-U+30ad: Ki
-U+30ae: Gi
-U+30af: Ku
-U+30b0: Gu
-U+30b1: Ke
-U+30b2: Ge
-U+30b3: Ko
-U+30b4: Go
-U+30b5: Sa
-U+30b6: Za
-U+30b7: Si
-U+30b8: Zi
-U+30b9: Su
-U+30ba: Zu
-U+30bb: Se
-U+30bc: Ze
-U+30bd: So
-U+30be: Zo
-U+30bf: Ta
-U+30c0: Da
-U+30c1: Ti
-U+30c2: Di
-U+30c3: TU
-U+30c4: Tu
-U+30c5: Du
-U+30c6: Te
-U+30c7: De
-U+30c8: To
-U+30c9: Do
-U+30ca: Na
-U+30cb: Ni
-U+30cc: Nu
-U+30cd: Ne
-U+30ce: No
-U+30cf: Ha
-U+30d0: Ba
-U+30d1: Pa
-U+30d2: Hi
-U+30d3: Bi
-U+30d4: Pi
-U+30d5: Hu
-U+30d6: Bu
-U+30d7: Pu
-U+30d8: He
-U+30d9: Be
-U+30da: Pe
-U+30db: Ho
-U+30dc: Bo
-U+30dd: Po
-U+30de: Ma
-U+30df: Mi
-U+30e0: Mu
-U+30e1: Me
-U+30e2: Mo
-U+30e3: YA
-U+30e4: Ya
-U+30e5: YU
-U+30e6: Yu
-U+30e7: YO
-U+30e8: Yo
-U+30e9: Ra
-U+30ea: Ri
-U+30eb: Ru
-U+30ec: Re
-U+30ed: Ro
-U+30ee: WA
-U+30ef: Wa
-U+30f0: Wi
-U+30f1: We
-U+30f2: Wo
-U+30f3: N6
-U+30f4: Vu
-U+30f5: KA
-U+30f6: KE
-U+30f7: Va
-U+30f8: Vi
-U+30f9: Ve
-U+30fa: Vo
-U+30fb: .6
-U+30fc: -6
-U+30fd: *6
-U+30fe: +6
-U+3105: b4
-U+3106: p4
-U+3107: m4
-U+3108: f4
-U+3109: d4
-U+310a: t4
-U+310b: n4
-U+310c: l4
-U+310d: g4
-U+310e: k4
-U+310f: h4
-U+3110: j4
-U+3111: q4
-U+3112: x4
-U+3113: zh
-U+3114: ch
-U+3115: sh
-U+3116: r4
-U+3117: z4
-U+3118: c4
-U+3119: s4
-U+311a: a4
-U+311b: o4
-U+311c: e4
-U+311d: _eh4_
-U+311e: ai
-U+311f: ei
-U+3120: au
-U+3121: ou
-U+3122: an
-U+3123: en
-U+3124: aN
-U+3125: eN
-U+3126: er
-U+3127: i4
-U+3128: u4
-U+3129: iu
-U+312a: v4
-U+312b: nG
-U+312c: gn
-U+321c: _(JU)_
-U+3220: 1c
-U+3221: 2c
-U+3222: 3c
-U+3223: 4c
-U+3224: 5c
-U+3225: 6c
-U+3226: 7c
-U+3227: 8c
-U+3228: 9c
-U+3229: _10c_
-U+327f: _KSC_
-U+fb00: ff
-U+fb01: fi
-U+fb02: fl
-U+fb03: _ffi_
-U+fb04: _ffl_
-U+fb05: ft
-U+fb06: st
-U+fe7d: _3+;_
-U+fe82: _aM._
-U+fe84: _aH._
-U+fe8d: _a+-_
-U+fe8e: _a+._
-U+fe8f: _b+-_
-U+fe90: _b+,_
-U+fe91: _b+;_
-U+fe92: _b+._
-U+fe93: _tm-_
-U+fe94: _tm._
-U+fe95: _t+-_
-U+fe96: _t+,_
-U+fe97: _t+;_
-U+fe98: _t+._
-U+fe99: _tk-_
-U+fe9a: _tk,_
-U+fe9b: _tk;_
-U+fe9c: _tk._
-U+fe9d: _g+-_
-U+fe9e: _g+,_
-U+fe9f: _g+;_
-U+fea0: _g+._
-U+fea1: _hk-_
-U+fea2: _hk,_
-U+fea3: _hk;_
-U+fea4: _hk._
-U+fea5: _x+-_
-U+fea6: _x+,_
-U+fea7: _x+;_
-U+fea8: _x+._
-U+fea9: _d+-_
-U+feaa: _d+._
-U+feab: _dk-_
-U+feac: _dk._
-U+fead: _r+-_
-U+feae: _r+._
-U+feaf: _z+-_
-U+feb0: _z+._
-U+feb1: _s+-_
-U+feb2: _s+,_
-U+feb3: _s+;_
-U+feb4: _s+._
-U+feb5: _sn-_
-U+feb6: _sn,_
-U+feb7: _sn;_
-U+feb8: _sn._
-U+feb9: _c+-_
-U+feba: _c+,_
-U+febb: _c+;_
-U+febc: _c+._
-U+febd: _dd-_
-U+febe: _dd,_
-U+febf: _dd;_
-U+fec0: _dd._
-U+fec1: _tj-_
-U+fec2: _tj,_
-U+fec3: _tj;_
-U+fec4: _tj._
-U+fec5: _zH-_
-U+fec6: _zH,_
-U+fec7: _zH;_
-U+fec8: _zH._
-U+fec9: _e+-_
-U+feca: _e+,_
-U+fecb: _e+;_
-U+fecc: _e+._
-U+fecd: _i+-_
-U+fece: _i+,_
-U+fecf: _i+;_
-U+fed0: _i+._
-U+fed1: _f+-_
-U+fed2: _f+,_
-U+fed3: _f+;_
-U+fed4: _f+._
-U+fed5: _q+-_
-U+fed6: _q+,_
-U+fed7: _q+;_
-U+fed8: _q+._
-U+fed9: _k+-_
-U+feda: _k+,_
-U+fedb: _k+;_
-U+fedc: _k+._
-U+fedd: _l+-_
-U+fede: _l+,_
-U+fedf: _l+;_
-U+fee0: _l+._
-U+fee1: _m+-_
-U+fee2: _m+,_
-U+fee3: _m+;_
-U+fee4: _m+._
-U+fee5: _n+-_
-U+fee6: _n+,_
-U+fee7: _n+;_
-U+fee8: _n+._
-U+fee9: _h+-_
-U+feea: _h+,_
-U+feeb: _h+;_
-U+feec: _h+._
-U+feed: _w+-_
-U+feee: _w+._
-U+feef: _j+-_
-U+fef0: _j+._
-U+fef1: _y+-_
-U+fef2: _y+,_
-U+fef3: _y+;_
-U+fef4: _y+._
-U+fef5: _lM-_
-U+fef6: _lM._
-U+fef7: _lH-_
-U+fef8: _lH._
-U+fef9: _lh-_
-U+fefa: _lh._
-U+fefb: _la-_
-U+fefc: _la._
-U+0000: NU
-U+0001: SH
-U+0002: SX
-U+0003: EX
-U+0004: ET
-U+0005: EQ
-U+0006: AK
-U+0007: BL
-U+0008: BS
-U+0009: HT
-# U+000a: LF
-U+000b: VT
-U+000c: FF
-U+000d: CR
-U+000e: SO
-U+000f: SI
-U+0010: DL
-U+0011: D1
-U+0012: D2
-U+0013: D3
-U+0014: D4
-U+0015: NK
-U+0016: SY
-U+0017: EB
-U+0018: CN
-U+0019: EM
-U+001a: SB
-U+001b: EC
-U+001c: FS
-U+001d: GS
-U+001e: RS
-U+001f: US
-U+007f: DT
-U+0080: PA
-U+0081: HO
-U+0082: BH
-U+0083: NH
-U+0084: IN
-U+0085: NL
-U+0086: SA
-U+0087: ES
-U+0088: HS
-U+0089: HJ
-U+008a: VS
-U+008b: PD
-U+008c: PU
-U+008d: RI
-U+008e: S2
-U+008f: S3
-U+0090: DC
-U+0091: P1
-U+0092: P2
-U+0093: TS
-U+0094: CC
-U+0095: MW
-U+0096: SG
-U+0097: EG
-U+0098: SS
-U+0099: GC
-U+009a: SC
-U+009b: CI
-U+009c: ST
-U+009d: OC
-U+009e: PM
-U+009f: AC
-# Characters in Private Use Area (e000-f8ff) do not have ussigned numbers
-# according Unicode 2.0
diff --git a/src/chrtrans/rfc_suni.tbl b/src/chrtrans/rfc_suni.tbl
deleted file mode 100644
index 65fa17ed..00000000
--- a/src/chrtrans/rfc_suni.tbl
+++ /dev/null
@@ -1,1958 +0,0 @@
-# Generated from the mnemonic file found under ftp://dkuug.dk/i18n/
-# then hand-tweaked
-# perl -n -e \
-# 'if (s|<([^ \t]+)>\s+<U([\dA-Z]{4})>\s.*$|U+\L\2\E:\1|) {s|/?(.)|\1|g&&print}'\
-# mnemonic,ds
-
-#The MIME name of this charset.
-Mmnemonic+ascii+0
-
-#Name as a Display Charset (used on Options screen)
-ORFC 1345 w/o Intro
-
-# Don't fall back to default table for unicode -> 8bit
-Fallback NO
-
-U+0020:SP
-U+0021:!
-U+0022:"
-U+0023:Nb
-U+0024:DO
-U+0025:%
-U+0026:&
-U+0027:'
-U+0028:(
-U+0029:)
-U+002a:*
-U+002b:+
-U+002c:,
-U+002d:-
-U+002e:.
-U+002f:/
-U+0030:0
-U+0031:1
-U+0032:2
-U+0033:3
-U+0034:4
-U+0035:5
-U+0036:6
-U+0037:7
-U+0038:8
-U+0039:9
-U+003a::
-U+003b:;
-U+003c:<
-U+003d:=
-U+003e:>
-U+003f:?
-U+0040:At
-U+0041:A
-U+0042:B
-U+0043:C
-U+0044:D
-U+0045:E
-U+0046:F
-U+0047:G
-U+0048:H
-U+0049:I
-U+004a:J
-U+004b:K
-U+004c:L
-U+004d:M
-U+004e:N
-U+004f:O
-U+0050:P
-U+0051:Q
-U+0052:R
-U+0053:S
-U+0054:T
-U+0055:U
-U+0056:V
-U+0057:W
-U+0058:X
-U+0059:Y
-U+005a:Z
-U+005b:<(
-U+005c://
-U+005d:)>
-U+005e:'>
-U+005f:_
-U+0060:'!
-U+0061:a
-U+0062:b
-U+0063:c
-U+0064:d
-U+0065:e
-U+0066:f
-U+0067:g
-U+0068:h
-U+0069:i
-U+006a:j
-U+006b:k
-U+006c:l
-U+006d:m
-U+006e:n
-U+006f:o
-U+0070:p
-U+0071:q
-U+0072:r
-U+0073:s
-U+0074:t
-U+0075:u
-U+0076:v
-U+0077:w
-U+0078:x
-U+0079:y
-U+007a:z
-U+007b:(!
-U+007c:!!
-U+007d:!)
-U+007e:'?
-U+00a0:NS
-U+00a1:!I
-U+00a2:Ct
-U+00a3:Pd
-U+00a4:Cu
-U+00a5:Ye
-U+00a6:BB
-U+00a7:SE
-U+00a8:':
-U+00a9:Co
-U+00aa:-a
-U+00ab:<<
-U+00ac:NO
-U+00ad:--
-U+00ae:Rg
-U+00af:'m
-U+00b0:DG
-U+00b1:+-
-U+00b2:2S
-U+00b3:3S
-U+00b4:''
-U+00b5:My
-U+00b6:PI
-U+00b7:.M
-U+00b8:',
-U+00b9:1S
-U+00ba:-o
-U+00bb:>>
-U+00bc:14
-U+00bd:12
-U+00be:34
-U+00bf:?I
-U+00c0:A!
-U+00c1:A'
-U+00c2:A>
-U+00c3:A?
-U+00c4:A:
-U+00c5:AA
-U+00c6:AE
-U+00c7:C,
-U+00c8:E!
-U+00c9:E'
-U+00ca:E>
-U+00cb:E:
-U+00cc:I!
-U+00cd:I'
-U+00ce:I>
-U+00cf:I:
-U+00d0:D-
-U+00d1:N?
-U+00d2:O!
-U+00d3:O'
-U+00d4:O>
-U+00d5:O?
-U+00d6:O:
-U+00d7:*X
-U+00d8:O/
-U+00d9:U!
-U+00da:U'
-U+00db:U>
-U+00dc:U:
-U+00dd:Y'
-U+00de:TH
-U+00df:ss
-U+00e0:a!
-U+00e1:a'
-U+00e2:a>
-U+00e3:a?
-U+00e4:a:
-U+00e5:aa
-U+00e6:ae
-U+00e7:c,
-U+00e8:e!
-U+00e9:e'
-U+00ea:e>
-U+00eb:e:
-U+00ec:i!
-U+00ed:i'
-U+00ee:i>
-U+00ef:i:
-U+00f0:d-
-U+00f1:n?
-U+00f2:o!
-U+00f3:o'
-U+00f4:o>
-U+00f5:o?
-U+00f6:o:
-U+00f7:-:
-U+00f8:o/
-U+00f9:u!
-U+00fa:u'
-U+00fb:u>
-U+00fc:u:
-U+00fd:y'
-U+00fe:th
-U+00ff:y:
-U+0100:A-
-U+0101:a-
-U+0102:A(
-U+0103:a(
-U+0104:A;
-U+0105:a;
-U+0106:C'
-U+0107:c'
-U+0108:C>
-U+0109:c>
-U+010a:C.
-U+010b:c.
-U+010c:C<
-U+010d:c<
-U+010e:D<
-U+010f:d<
-U+0110:D/
-U+0111:d/
-U+0112:E-
-U+0113:e-
-U+0114:E(
-U+0115:e(
-U+0116:E.
-U+0117:e.
-U+0118:E;
-U+0119:e;
-U+011a:E<
-U+011b:e<
-U+011c:G>
-U+011d:g>
-U+011e:G(
-U+011f:g(
-U+0120:G.
-U+0121:g.
-U+0122:G,
-U+0123:g,
-U+0124:H>
-U+0125:h>
-U+0126:H/
-U+0127:h/
-U+0128:I?
-U+0129:i?
-U+012a:I-
-U+012b:i-
-U+012c:I(
-U+012d:i(
-U+012e:I;
-U+012f:i;
-U+0130:I.
-U+0131:i.
-U+0132:IJ
-U+0133:ij
-U+0134:J>
-U+0135:j>
-U+0136:K,
-U+0137:k,
-U+0138:kk
-U+0139:L'
-U+013a:l'
-U+013b:L,
-U+013c:l,
-U+013d:L<
-U+013e:l<
-U+013f:L.
-U+0140:l.
-U+0141:L/
-U+0142:l/
-U+0143:N'
-U+0144:n'
-U+0145:N,
-U+0146:n,
-U+0147:N<
-U+0148:n<
-U+0149:'n
-U+014a:NG
-U+014b:ng
-U+014c:O-
-U+014d:o-
-U+014e:O(
-U+014f:o(
-U+0150:O"
-U+0151:o"
-U+0152:OE
-U+0153:oe
-U+0154:R'
-U+0155:r'
-U+0156:R,
-U+0157:r,
-U+0158:R<
-U+0159:r<
-U+015a:S'
-U+015b:s'
-U+015c:S>
-U+015d:s>
-U+015e:S,
-U+015f:s,
-U+0160:S<
-U+0161:s<
-U+0162:T,
-U+0163:t,
-U+0164:T<
-U+0165:t<
-U+0166:T/
-U+0167:t/
-U+0168:U?
-U+0169:u?
-U+016a:U-
-U+016b:u-
-U+016c:U(
-U+016d:u(
-U+016e:U0
-U+016f:u0
-U+0170:U"
-U+0171:u"
-U+0172:U;
-U+0173:u;
-U+0174:W>
-U+0175:w>
-U+0176:Y>
-U+0177:y>
-U+0178:Y:
-U+0179:Z'
-U+017a:z'
-U+017b:Z.
-U+017c:z.
-U+017d:Z<
-U+017e:z<
-U+017f:s1
-U+0187:C2
-U+0188:c2
-U+0191:F2
-U+0192:f2
-U+0198:K2
-U+0199:k2
-U+01a0:O9
-U+01a1:o9
-U+01a2:OI
-U+01a3:oi
-U+01a6:yr
-U+01af:U9
-U+01b0:u9
-U+01b5:Z/
-U+01b6:z/
-U+01b7:ED
-U+01cd:A<
-U+01ce:a<
-U+01cf:I<
-U+01d0:i<
-U+01d1:O<
-U+01d2:o<
-U+01d3:U<
-U+01d4:u<
-U+01d5:U:-
-U+01d6:u:-
-U+01d7:U:'
-U+01d8:u:'
-U+01d9:U:<
-U+01da:u:<
-U+01db:U:!
-U+01dc:u:!
-U+01de:A1
-U+01df:a1
-U+01e0:A7
-U+01e1:a7
-U+01e2:A3
-U+01e3:a3
-U+01e4:G/
-U+01e5:g/
-U+01e6:G<
-U+01e7:g<
-U+01e8:K<
-U+01e9:k<
-U+01ea:O;
-U+01eb:o;
-U+01ec:O1
-U+01ed:o1
-U+01ee:EZ
-U+01ef:ez
-U+01f0:j<
-U+01f4:G'
-U+01f5:g'
-U+01fa:AA'
-U+01fb:aa'
-U+01fc:AE'
-U+01fd:ae'
-U+01fe:O/'
-U+01ff:o/'
-U+0200:A!!
-U+0201:a!!
-U+0202:A)
-U+0203:a)
-U+0204:E!!
-U+0205:e!!
-U+0206:E)
-U+0207:e)
-U+0208:I!!
-U+0209:i!!
-U+020a:I)
-U+020b:i)
-U+020c:O!!
-U+020d:o!!
-U+020e:O)
-U+020f:o)
-U+0210:R!!
-U+0211:r!!
-U+0212:R)
-U+0213:r)
-U+0214:U!!
-U+0215:u!!
-U+0216:U)
-U+0217:u)
-U+0292:ed
-U+02bb:;S
-U+02c6:1>
-U+02c7:'<
-U+02c9:1-
-U+02cb:1!
-U+02d8:'(
-U+02d9:'.
-U+02da:'0
-U+02db:';
-U+02dc:1?
-U+02dd:'"
-U+0374:'G
-U+0375:,G
-U+037a:j3
-U+037e:?%
-U+0384:'*
-U+0385:'%
-U+0386:A%
-U+0387:.*
-U+0388:E%
-U+0389:Y%
-U+038a:I%
-U+038c:O%
-U+038e:U%
-U+038f:W%
-U+0390:i3
-U+0391:A*
-U+0392:B*
-U+0393:G*
-U+0394:D*
-U+0395:E*
-U+0396:Z*
-U+0397:Y*
-U+0398:H*
-U+0399:I*
-U+039a:K*
-U+039b:L*
-U+039c:M*
-U+039d:N*
-U+039e:C*
-U+039f:O*
-U+03a0:P*
-U+03a1:R*
-U+03a3:S*
-U+03a4:T*
-U+03a5:U*
-U+03a6:F*
-U+03a7:X*
-U+03a8:Q*
-U+03a9:W*
-U+03aa:J*
-U+03ab:V*
-U+03ac:a%
-U+03ad:e%
-U+03ae:y%
-U+03af:i%
-U+03b0:u3
-U+03b1:a*
-U+03b2:b*
-U+03b3:g*
-U+03b4:d*
-U+03b5:e*
-U+03b6:z*
-U+03b7:y*
-U+03b8:h*
-U+03b9:i*
-U+03ba:k*
-U+03bb:l*
-U+03bc:m*
-U+03bd:n*
-U+03be:c*
-U+03bf:o*
-U+03c0:p*
-U+03c1:r*
-U+03c2:*s
-U+03c3:s*
-U+03c4:t*
-U+03c5:u*
-U+03c6:f*
-U+03c7:x*
-U+03c8:q*
-U+03c9:w*
-U+03ca:j*
-U+03cb:v*
-U+03cc:o%
-U+03cd:u%
-U+03ce:w%
-U+03d0:b3
-U+03da:T3
-U+03db:t3
-U+03dc:M3
-U+03dd:m3
-U+03de:K3
-U+03df:k3
-U+03e0:P3
-U+03e1:p3
-U+0401:IO
-U+0402:D%
-U+0403:G%
-U+0404:IE
-U+0405:DS
-U+0406:II
-U+0407:YI
-U+0408:J%
-U+0409:LJ
-U+040a:NJ
-U+040b:Ts
-U+040c:KJ
-U+040e:V%
-U+040f:DZ
-U+0410:A=
-U+0411:B=
-U+0412:V=
-U+0413:G=
-U+0414:D=
-U+0415:E=
-U+0416:Z%
-U+0417:Z=
-U+0418:I=
-U+0419:J=
-U+041a:K=
-U+041b:L=
-U+041c:M=
-U+041d:N=
-U+041e:O=
-U+041f:P=
-U+0420:R=
-U+0421:S=
-U+0422:T=
-U+0423:U=
-U+0424:F=
-U+0425:H=
-U+0426:C=
-U+0427:C%
-U+0428:S%
-U+0429:Sc
-U+042a:="
-U+042b:Y=
-U+042c:%"
-U+042d:JE
-U+042e:JU
-U+042f:JA
-U+0430:a=
-U+0431:b=
-U+0432:v=
-U+0433:g=
-U+0434:d=
-U+0435:e=
-U+0436:z%
-U+0437:z=
-U+0438:i=
-U+0439:j=
-U+043a:k=
-U+043b:l=
-U+043c:m=
-U+043d:n=
-U+043e:o=
-U+043f:p=
-U+0440:r=
-U+0441:s=
-U+0442:t=
-U+0443:u=
-U+0444:f=
-U+0445:h=
-U+0446:c=
-U+0447:c%
-U+0448:s%
-U+0449:sc
-U+044a:='
-U+044b:y=
-U+044c:%'
-U+044d:je
-U+044e:ju
-U+044f:ja
-U+0451:io
-U+0452:d%
-U+0453:g%
-U+0454:ie
-U+0455:ds
-U+0456:ii
-U+0457:yi
-U+0458:j%
-U+0459:lj
-U+045a:nj
-U+045b:ts
-U+045c:kj
-U+045e:v%
-U+045f:dz
-U+0462:Y3
-U+0463:y3
-U+046a:O3
-U+046b:o3
-U+0472:F3
-U+0473:f3
-U+0474:V3
-U+0475:v3
-U+0480:C3
-U+0481:c3
-U+0490:G3
-U+0491:g3
-U+05d0:A+
-U+05d1:B+
-U+05d2:G+
-U+05d3:D+
-U+05d4:H+
-U+05d5:W+
-U+05d6:Z+
-U+05d7:X+
-U+05d8:Tj
-U+05d9:J+
-U+05da:K%
-U+05db:K+
-U+05dc:L+
-U+05dd:M%
-U+05de:M+
-U+05df:N%
-U+05e0:N+
-U+05e1:S+
-U+05e2:E+
-U+05e3:P%
-U+05e4:P+
-U+05e5:Zj
-U+05e6:ZJ
-U+05e7:Q+
-U+05e8:R+
-U+05e9:Sh
-U+05ea:T+
-U+060c:,+
-U+061b:;+
-U+061f:?+
-U+0621:H'
-U+0622:aM
-U+0623:aH
-U+0624:wH
-U+0625:ah
-U+0626:yH
-U+0627:a+
-U+0628:b+
-U+0629:tm
-U+062a:t+
-U+062b:tk
-U+062c:g+
-U+062d:hk
-U+062e:x+
-U+062f:d+
-U+0630:dk
-U+0631:r+
-U+0632:z+
-U+0633:s+
-U+0634:sn
-U+0635:c+
-U+0636:dd
-U+0637:tj
-U+0638:zH
-U+0639:e+
-U+063a:i+
-U+0640:++
-U+0641:f+
-U+0642:q+
-U+0643:k+
-U+0644:l+
-U+0645:m+
-U+0646:n+
-U+0647:h+
-U+0648:w+
-U+0649:j+
-U+064a:y+
-U+064b::+
-U+064c:"+
-U+064d:=+
-U+064e:/+
-U+064f:'+
-U+0650:1+
-U+0651:3+
-U+0652:0+
-U+0660:0a
-U+0661:1a
-U+0662:2a
-U+0663:3a
-U+0664:4a
-U+0665:5a
-U+0666:6a
-U+0667:7a
-U+0668:8a
-U+0669:9a
-U+0670:aS
-U+067e:p+
-U+0681:hH
-U+0686:tc
-U+0698:zj
-U+06a4:v+
-U+06af:gf
-U+1e00:A-0
-U+1e01:a-0
-U+1e02:B.
-U+1e03:b.
-U+1e04:B-.
-U+1e05:b-.
-U+1e06:B_
-U+1e07:b_
-U+1e08:C,'
-U+1e09:c,'
-U+1e0a:D.
-U+1e0b:d.
-U+1e0c:D-.
-U+1e0d:d-.
-U+1e0e:D_
-U+1e0f:d_
-U+1e10:D,
-U+1e11:d,
-U+1e12:D->
-U+1e13:d->
-U+1e14:E-!
-U+1e15:e-!
-U+1e16:E-'
-U+1e17:e-'
-U+1e18:E->
-U+1e19:e->
-U+1e1a:E-?
-U+1e1b:e-?
-U+1e1c:E,(
-U+1e1d:e,(
-U+1e1e:F.
-U+1e1f:f.
-U+1e20:G-
-U+1e21:g-
-U+1e22:H.
-U+1e23:h.
-U+1e24:H-.
-U+1e25:h-.
-U+1e26:H:
-U+1e27:h:
-U+1e28:H,
-U+1e29:h,
-U+1e2a:H-(
-U+1e2b:h-(
-U+1e2c:I-?
-U+1e2d:i-?
-U+1e2e:I:'
-U+1e2f:i:'
-U+1e30:K'
-U+1e31:k'
-U+1e32:K-.
-U+1e33:k-.
-U+1e34:K_
-U+1e35:k_
-U+1e36:L-.
-U+1e37:l-.
-U+1e38:L--.
-U+1e39:l--.
-U+1e3a:L_
-U+1e3b:l_
-U+1e3c:L->
-U+1e3d:l->
-U+1e3e:M'
-U+1e3f:m'
-U+1e40:M.
-U+1e41:m.
-U+1e42:M-.
-U+1e43:m-.
-U+1e44:N.
-U+1e45:n.
-U+1e46:N-.
-U+1e47:n-.
-U+1e48:N_
-U+1e49:n_
-U+1e4a:N->
-U+1e4b:n->
-U+1e4c:O?'
-U+1e4d:o?'
-U+1e4e:O?:
-U+1e4f:o?:
-U+1e50:O-!
-U+1e51:o-!
-U+1e52:O-'
-U+1e53:o-'
-U+1e54:P'
-U+1e55:p'
-U+1e56:P.
-U+1e57:p.
-U+1e58:R.
-U+1e59:r.
-U+1e5a:R-.
-U+1e5b:r-.
-U+1e5c:R--.
-U+1e5d:r--.
-U+1e5e:R_
-U+1e5f:r_
-U+1e60:S.
-U+1e61:s.
-U+1e62:S-.
-U+1e63:s-.
-U+1e64:S'.
-U+1e65:s'.
-U+1e66:S<.
-U+1e67:s<.
-U+1e68:S.-.
-U+1e69:s.-.
-U+1e6a:T.
-U+1e6b:t.
-U+1e6c:T-.
-U+1e6d:t-.
-U+1e6e:T_
-U+1e6f:t_
-U+1e70:T->
-U+1e71:t->
-U+1e72:U--:
-U+1e73:u--:
-U+1e74:U-?
-U+1e75:u-?
-U+1e76:U->
-U+1e77:u->
-U+1e78:U?'
-U+1e79:u?'
-U+1e7a:U-:
-U+1e7b:u-:
-U+1e7c:V?
-U+1e7d:v?
-U+1e7e:V-.
-U+1e7f:v-.
-U+1e80:W!
-U+1e81:w!
-U+1e82:W'
-U+1e83:w'
-U+1e84:W:
-U+1e85:w:
-U+1e86:W.
-U+1e87:w.
-U+1e88:W-.
-U+1e89:w-.
-U+1e8a:X.
-U+1e8b:x.
-U+1e8c:X:
-U+1e8d:x:
-U+1e8e:Y.
-U+1e8f:y.
-U+1e90:Z>
-U+1e91:z>
-U+1e92:Z-.
-U+1e93:z-.
-U+1e94:Z_
-U+1e95:z_
-U+1e96:h_
-U+1e97:t:
-U+1e98:w0
-U+1e99:y0
-U+1ea0:A-.
-U+1ea1:a-.
-U+1ea2:A2
-U+1ea3:a2
-U+1ea4:A>'
-U+1ea5:a>'
-U+1ea6:A>!
-U+1ea7:a>!
-U+1ea8:A>2
-U+1ea9:a>2
-U+1eaa:A>?
-U+1eab:a>?
-U+1eac:A>-.
-U+1ead:a>-.
-U+1eae:A('
-U+1eaf:a('
-U+1eb0:A(!
-U+1eb1:a(!
-U+1eb2:A(2
-U+1eb3:a(2
-U+1eb4:A(?
-U+1eb5:a(?
-U+1eb6:A(-.
-U+1eb7:a(-.
-U+1eb8:E-.
-U+1eb9:e-.
-U+1eba:E2
-U+1ebb:e2
-U+1ebc:E?
-U+1ebd:e?
-U+1ebe:E>'
-U+1ebf:e>'
-U+1ec0:E>!
-U+1ec1:e>!
-U+1ec2:E>2
-U+1ec3:e>2
-U+1ec4:E>?
-U+1ec5:e>?
-U+1ec6:E>-.
-U+1ec7:e>-.
-U+1ec8:I2
-U+1ec9:i2
-U+1eca:I-.
-U+1ecb:i-.
-U+1ecc:O-.
-U+1ecd:o-.
-U+1ece:O2
-U+1ecf:o2
-U+1ed0:O>'
-U+1ed1:o>'
-U+1ed2:O>!
-U+1ed3:o>!
-U+1ed4:O>2
-U+1ed5:o>2
-U+1ed6:O>?
-U+1ed7:o>?
-U+1ed8:O>-.
-U+1ed9:o>-.
-U+1eda:O9'
-U+1edb:o9'
-U+1edc:O9!
-U+1edd:o9!
-U+1ede:O92
-U+1edf:o92
-U+1ee0:O9?
-U+1ee1:o9?
-U+1ee2:O9-.
-U+1ee3:o9-.
-U+1ee4:U-.
-U+1ee5:u-.
-U+1ee6:U2
-U+1ee7:u2
-U+1ee8:U9'
-U+1ee9:u9'
-U+1eea:U9!
-U+1eeb:u9!
-U+1eec:U92
-U+1eed:u92
-U+1eee:U9?
-U+1eef:u9?
-U+1ef0:U9-.
-U+1ef1:u9-.
-U+1ef2:Y!
-U+1ef3:y!
-U+1ef4:Y-.
-U+1ef5:y-.
-U+1ef6:Y2
-U+1ef7:y2
-U+1ef8:Y?
-U+1ef9:y?
-U+1fbf:,,
-U+1fc0:?*
-U+1fc1:?:
-U+1fcd:,!
-U+1fce:,'
-U+1fcf:?,
-U+1fdd:;!
-U+1fde:;'
-U+1fdf:?;
-U+1fed:!:
-U+1fef:!*
-U+1ffe:;;
-U+2002:1N
-U+2003:1M
-U+2004:3M
-U+2005:4M
-U+2006:6M
-U+200e:LR
-U+200f:RL
-U+2009:1T
-U+200a:1H
-U+2010:-1
-U+2013:-N
-U+2014:-M
-U+2015:-3
-U+2016:!2
-U+2017:=2
-U+2018:'6
-U+2019:'9
-U+201a:.9
-U+201b:9'
-U+201c:"6
-U+201d:"9
-U+201e::9
-U+201f:9"
-U+2020:/-
-U+2021:/=
-U+2022:Sb
-U+2025:..
-U+2026:.3
-U+2030:%0
-U+2032:1'
-U+2033:2'
-U+2034:3'
-U+2035:1"
-U+2036:2"
-U+2037:3"
-U+2038:Ca
-U+2039:<1
-U+203a:>1
-U+203b::X
-U+203c:!*2
-U+203e:'-
-U+2044:/f
-U+2070:0S
-U+2074:4S
-U+2075:5S
-U+2076:6S
-U+2077:7S
-U+2078:8S
-U+2079:9S
-U+207a:+S
-U+207b:-S
-U+207c:=S
-U+207d:(S
-U+207e:)S
-U+207f:nS
-U+2080:0s
-U+2081:1s
-U+2082:2s
-U+2083:3s
-U+2084:4s
-U+2085:5s
-U+2086:6s
-U+2087:7s
-U+2088:8s
-U+2089:9s
-U+208a:+s
-U+208b:-s
-U+208c:=s
-U+208d:(s
-U+208e:)s
-U+20a3:Ff
-U+20a4:Li
-U+20a7:Pt
-U+20a9:W=
-U+2103:oC
-U+2105:co
-U+2109:oF
-U+2116:N0
-U+2117:PO
-U+211e:Rx
-U+2120:SM
-U+2122:TM
-U+2126:Om
-U+212b:AO
-U+2153:13
-U+2154:23
-U+2155:15
-U+2156:25
-U+2157:35
-U+2158:45
-U+2159:16
-U+215a:56
-U+215b:18
-U+215c:38
-U+215d:58
-U+215e:78
-U+2160:1R
-U+2161:2R
-U+2162:3R
-U+2163:4R
-U+2164:5R
-U+2165:6R
-U+2166:7R
-U+2167:8R
-U+2168:9R
-U+2169:aR
-U+216a:bR
-U+216b:cR
-U+216c:50R
-U+216d:100R
-U+216e:500R
-U+216f:1000R
-U+2170:1r
-U+2171:2r
-U+2172:3r
-U+2173:4r
-U+2174:5r
-U+2175:6r
-U+2176:7r
-U+2177:8r
-U+2178:9r
-U+2179:ar
-U+217a:br
-U+217b:cr
-U+217c:50r
-U+217d:100r
-U+217e:500r
-U+217f:1000r
-U+2180:1000RCD
-U+2181:5000R
-U+2182:10000R
-U+2190:<-
-U+2191:-!
-U+2192:->
-U+2193:-v
-U+2194:<>
-U+2195:UD
-U+2196:<!!
-U+2197://>
-U+2198:!!>
-U+2199:<//
-U+21a8:UD-
-U+21c0:>V
-U+21d0:<=
-U+21d2:=>
-U+21d4:==
-U+2200:FA
-U+2202:dP
-U+2203:TE
-U+2205:/0
-U+2206:DE
-U+2207:NB
-U+2208:(-
-U+220b:-)
-U+220f:*P
-U+2211:+Z
-U+2212:-2
-U+2213:-+
-U+2214:.+
-U+2217:*-
-U+2218:Ob
-U+2219:sb
-U+221a:RT
-U+221d:0(
-U+221e:00
-U+221f:-L
-U+2220:-V
-U+2225:PP
-U+2227:AN
-U+2228:OR
-U+2229:(U
-U+222a:)U
-U+222b:In
-U+222c:DI
-U+222e:Io
-U+2234:.:
-U+2235::.
-U+2236::R
-U+2237:::
-U+223c:?1
-U+223e:CG
-U+2243:?-
-U+2245:?=
-U+2248:?2
-U+224c:=?
-U+2253:HI
-U+2260:!=
-U+2261:=3
-U+2264:=<
-U+2265:>=
-U+226a:<*
-U+226b:*>
-U+226e:!<
-U+226f:!>
-U+2282:(C
-U+2283:)C
-U+2286:(_
-U+2287:)_
-U+2299:0.
-U+229a:02
-U+22a5:-T
-U+22c5:.P
-U+22ee::3
-U+2302:Eh
-U+2308:<7
-U+2309:>7
-U+230a:7<
-U+230b:7>
-U+2310:NI
-U+2312:(A
-U+2315:TR
-U+2318:88
-U+2320:Iu
-U+2321:Il
-U+2329:</
-U+232a:/>
-U+2423:Vs
-U+2440:1h
-U+2441:3h
-U+2442:2h
-U+2443:4h
-U+2446:1j
-U+2447:2j
-U+2448:3j
-U+2449:4j
-U+2460:1-o
-U+2461:2-o
-U+2462:3-o
-U+2463:4-o
-U+2464:5-o
-U+2465:6-o
-U+2466:7-o
-U+2467:8-o
-U+2468:9-o
-U+2469:10-o
-U+246a:11-o
-U+246b:12-o
-U+246c:13-o
-U+246d:14-o
-U+246e:15-o
-U+246f:16-o
-U+2470:17-o
-U+2471:18-o
-U+2472:19-o
-U+2473:20-o
-U+2474:(1)
-U+2475:(2)
-U+2476:(3)
-U+2477:(4)
-U+2478:(5)
-U+2479:(6)
-U+247a:(7)
-U+247b:(8)
-U+247c:(9)
-U+247d:(10)
-U+247e:(11)
-U+247f:(12)
-U+2480:(13)
-U+2481:(14)
-U+2482:(15)
-U+2483:(16)
-U+2484:(17)
-U+2485:(18)
-U+2486:(19)
-U+2487:(20)
-U+2488:1.
-U+2489:2.
-U+248a:3.
-U+248b:4.
-U+248c:5.
-U+248d:6.
-U+248e:7.
-U+248f:8.
-U+2490:9.
-U+2491:10.
-U+2492:11.
-U+2493:12.
-U+2494:13.
-U+2495:14.
-U+2496:15.
-U+2497:16.
-U+2498:17.
-U+2499:18.
-U+249a:19.
-U+249b:20.
-U+249c:(a)
-U+249d:(b)
-U+249e:(c)
-U+249f:(d)
-U+24a0:(e)
-U+24a1:(f)
-U+24a2:(g)
-U+24a3:(h)
-U+24a4:(i)
-U+24a5:(j)
-U+24a6:(k)
-U+24a7:(l)
-U+24a8:(m)
-U+24a9:(n)
-U+24aa:(o)
-U+24ab:(p)
-U+24ac:(q)
-U+24ad:(r)
-U+24ae:(s)
-U+24af:(t)
-U+24b0:(u)
-U+24b1:(v)
-U+24b2:(w)
-U+24b3:(x)
-U+24b4:(y)
-U+24b5:(z)
-U+24b6:A-o
-U+24b7:B-o
-U+24b8:C-o
-U+24b9:D-o
-U+24ba:E-o
-U+24bb:F-o
-U+24bc:G-o
-U+24bd:H-o
-U+24be:I-o
-U+24bf:J-o
-U+24c0:K-o
-U+24c1:L-o
-U+24c2:M-o
-U+24c3:N-o
-U+24c4:O-o
-U+24c5:P-o
-U+24c6:Q-o
-U+24c7:R-o
-U+24c8:S-o
-U+24c9:T-o
-U+24ca:U-o
-U+24cb:V-o
-U+24cc:W-o
-U+24cd:X-o
-U+24ce:Y-o
-U+24cf:Z-o
-U+24d0:a-o
-U+24d1:b-o
-U+24d2:c-o
-U+24d3:d-o
-U+24d4:e-o
-U+24d5:f-o
-U+24d6:g-o
-U+24d7:h-o
-U+24d8:i-o
-U+24d9:j-o
-U+24da:k-o
-U+24db:l-o
-U+24dc:m-o
-U+24dd:n-o
-U+24de:o-o
-U+24df:p-o
-U+24e0:q-o
-U+24e1:r-o
-U+24e2:s-o
-U+24e3:t-o
-U+24e4:u-o
-U+24e5:v-o
-U+24e6:w-o
-U+24e7:x-o
-U+24e8:y-o
-U+24e9:z-o
-U+24ea:0-o
-U+2500:hh
-U+2501:HH-
-U+2502:vv
-U+2503:VV-
-U+2504:3-
-U+2505:3_
-U+2506:3!
-U+2507:3/
-U+2508:4-
-U+2509:4_
-U+250a:4!
-U+250b:4/
-U+250c:dr
-U+250d:dR-
-U+250e:Dr-
-U+250f:DR-
-U+2510:dl
-U+2511:dL-
-U+2512:Dl-
-U+2513:LD-
-U+2514:ur
-U+2515:uR-
-U+2516:Ur-
-U+2517:UR-
-U+2518:ul
-U+2519:uL-
-U+251a:Ul-
-U+251b:UL-
-U+251c:vr
-U+251d:vR-
-U+251e:Udr
-U+251f:uDr
-U+2520:Vr-
-U+2521:UdR
-U+2522:uDR
-U+2523:VR-
-U+2524:vl
-U+2525:vL-
-U+2526:Udl
-U+2527:uDl
-U+2528:Vl-
-U+2529:UdL
-U+252a:uDL
-U+252b:VL-
-U+252c:dh
-U+252d:dLr
-U+252e:dlR
-U+252f:dH-
-U+2530:Dh-
-U+2531:DLr
-U+2532:DlR
-U+2533:DH-
-U+2534:uh
-U+2535:uLr
-U+2536:ulR
-U+2537:uH-
-U+2538:Uh-
-U+2539:ULr
-U+253a:UlR
-U+253b:UH-
-U+253c:vh
-U+253d:vLr
-U+253e:vlR
-U+253f:vH-
-U+2540:Udh
-U+2541:uDh
-U+2542:Vh-
-U+2543:UdLr
-U+2544:UdlR
-U+2545:uDLr
-U+2546:uDlR
-U+2547:UdH
-U+2548:uDH
-U+2549:VLr
-U+254a:VlR
-U+254b:VH-
-U+2550:HH
-U+2551:VV
-U+2552:dR
-U+2553:Dr
-U+2554:DR
-U+2555:dL
-U+2556:Dl
-U+2557:LD
-U+2558:uR
-U+2559:Ur
-U+255a:UR
-U+255b:uL
-U+255c:Ul
-U+255d:UL
-U+255e:vR
-U+255f:Vr
-U+2560:VR
-U+2561:vL
-U+2562:Vl
-U+2563:VL
-U+2564:dH
-U+2565:Dh
-U+2566:DH
-U+2567:uH
-U+2568:Uh
-U+2569:UH
-U+256a:vH
-U+256b:Vh
-U+256c:VH
-U+2571:FD
-U+2572:BD
-U+2580:TB
-U+2584:LB
-U+2588:FB
-U+258c:lB
-U+2590:RB
-U+2591:.S
-U+2592::S
-U+2593:?S
-U+25a0:fS
-U+25a1:OS
-U+25a2:RO
-U+25a3:Rr
-U+25a4:RF
-U+25a5:RY
-U+25a6:RH
-U+25a7:RZ
-U+25a8:RK
-U+25a9:RX
-U+25aa:sB
-U+25ac:SR
-U+25ad:Or
-U+25b2:UT
-U+25b3:uT
-U+25b7:Tr
-U+25ba:PR
-U+25bc:Dt
-U+25bd:dT
-U+25c1:Tl
-U+25c4:PL
-U+25c6:Db
-U+25c7:Dw
-U+25ca:LZ
-U+25cb:0m
-U+25ce:0o
-U+25cf:0M
-U+25d0:0L
-U+25d1:0R
-U+25d8:Sn
-U+25d9:Ic
-U+25e2:Fd
-U+25e3:Bd
-U+25ef:Ci
-U+2605:*2
-U+2606:*1
-U+260e:TEL
-U+260f:tel
-U+261c:<H
-U+261e:>H
-U+263a:0u
-U+263b:0U
-U+263c:SU
-U+2640:Fm
-U+2642:Ml
-U+2660:cS
-U+2661:cH
-U+2662:cD
-U+2663:cC
-U+2664:cS-
-U+2665:cH-
-U+2666:cD-
-U+2667:cC-
-U+2669:Md
-U+266a:M8
-U+266b:M2
-U+266c:M16
-U+266d:Mb
-U+266e:Mx
-U+266f:MX
-U+2713:OK
-U+2717:XX
-U+2720:-X
-U+3000:IS
-U+3001:,_
-U+3002:._
-U+3003:+"
-U+3004:JIS
-U+3005:*_
-U+3006:;_
-U+3007:0_
-U+300a:<+
-U+300b:>+
-U+300c:<'
-U+300d:>'
-U+300e:<"
-U+300f:>"
-U+3010:("
-U+3011:)"
-U+3012:=T
-U+3013:=_
-U+3014:('
-U+3015:)'
-U+3016:(I
-U+3017:)I
-U+301c:-?
-U+3020:=T:)
-U+3041:A5
-U+3042:a5
-U+3043:I5
-U+3044:i5
-U+3045:U5
-U+3046:u5
-U+3047:E5
-U+3048:e5
-U+3049:O5
-U+304a:o5
-U+304b:ka
-U+304c:ga
-U+304d:ki
-U+304e:gi
-U+304f:ku
-U+3050:gu
-U+3051:ke
-U+3052:ge
-U+3053:ko
-U+3054:go
-U+3055:sa
-U+3056:za
-U+3057:si
-U+3058:zi
-U+3059:su
-U+305a:zu
-U+305b:se
-U+305c:ze
-U+305d:so
-U+305e:zo
-U+305f:ta
-U+3060:da
-U+3061:ti
-U+3062:di
-U+3063:tU
-U+3064:tu
-U+3065:du
-U+3066:te
-U+3067:de
-U+3068:to
-U+3069:do
-U+306a:na
-U+306b:ni
-U+306c:nu
-U+306d:ne
-U+306e:no
-U+306f:ha
-U+3070:ba
-U+3071:pa
-U+3072:hi
-U+3073:bi
-U+3074:pi
-U+3075:hu
-U+3076:bu
-U+3077:pu
-U+3078:he
-U+3079:be
-U+307a:pe
-U+307b:ho
-U+307c:bo
-U+307d:po
-U+307e:ma
-U+307f:mi
-U+3080:mu
-U+3081:me
-U+3082:mo
-U+3083:yA
-U+3084:ya
-U+3085:yU
-U+3086:yu
-U+3087:yO
-U+3088:yo
-U+3089:ra
-U+308a:ri
-U+308b:ru
-U+308c:re
-U+308d:ro
-U+308e:wA
-U+308f:wa
-U+3090:wi
-U+3091:we
-U+3092:wo
-U+3093:n5
-U+3094:vu
-U+309b:"5
-U+309c:05
-U+309d:*5
-U+309e:+5
-U+30a1:a6
-U+30a2:A6
-U+30a3:i6
-U+30a4:I6
-U+30a5:u6
-U+30a6:U6
-U+30a7:e6
-U+30a8:E6
-U+30a9:o6
-U+30aa:O6
-U+30ab:Ka
-U+30ac:Ga
-U+30ad:Ki
-U+30ae:Gi
-U+30af:Ku
-U+30b0:Gu
-U+30b1:Ke
-U+30b2:Ge
-U+30b3:Ko
-U+30b4:Go
-U+30b5:Sa
-U+30b6:Za
-U+30b7:Si
-U+30b8:Zi
-U+30b9:Su
-U+30ba:Zu
-U+30bb:Se
-U+30bc:Ze
-U+30bd:So
-U+30be:Zo
-U+30bf:Ta
-U+30c0:Da
-U+30c1:Ti
-U+30c2:Di
-U+30c3:TU
-U+30c4:Tu
-U+30c5:Du
-U+30c6:Te
-U+30c7:De
-U+30c8:To
-U+30c9:Do
-U+30ca:Na
-U+30cb:Ni
-U+30cc:Nu
-U+30cd:Ne
-U+30ce:No
-U+30cf:Ha
-U+30d0:Ba
-U+30d1:Pa
-U+30d2:Hi
-U+30d3:Bi
-U+30d4:Pi
-U+30d5:Hu
-U+30d6:Bu
-U+30d7:Pu
-U+30d8:He
-U+30d9:Be
-U+30da:Pe
-U+30db:Ho
-U+30dc:Bo
-U+30dd:Po
-U+30de:Ma
-U+30df:Mi
-U+30e0:Mu
-U+30e1:Me
-U+30e2:Mo
-U+30e3:YA
-U+30e4:Ya
-U+30e5:YU
-U+30e6:Yu
-U+30e7:YO
-U+30e8:Yo
-U+30e9:Ra
-U+30ea:Ri
-U+30eb:Ru
-U+30ec:Re
-U+30ed:Ro
-U+30ee:WA
-U+30ef:Wa
-U+30f0:Wi
-U+30f1:We
-U+30f2:Wo
-U+30f3:N6
-U+30f4:Vu
-U+30f5:KA
-U+30f6:KE
-U+30f7:Va
-U+30f8:Vi
-U+30f9:Ve
-U+30fa:Vo
-U+30fb:.6
-U+30fc:-6
-U+30fd:*6
-U+30fe:+6
-U+3105:b4
-U+3106:p4
-U+3107:m4
-U+3108:f4
-U+3109:d4
-U+310a:t4
-U+310b:n4
-U+310c:l4
-U+310d:g4
-U+310e:k4
-U+310f:h4
-U+3110:j4
-U+3111:q4
-U+3112:x4
-U+3113:zh
-U+3114:ch
-U+3115:sh
-U+3116:r4
-U+3117:z4
-U+3118:c4
-U+3119:s4
-U+311a:a4
-U+311b:o4
-U+311c:e4
-U+311d:eh4
-U+311e:ai
-U+311f:ei
-U+3120:au
-U+3121:ou
-U+3122:an
-U+3123:en
-U+3124:aN
-U+3125:eN
-U+3126:er
-U+3127:i4
-U+3128:u4
-U+3129:iu
-U+312a:v4
-U+312b:nG
-U+312c:gn
-U+321c:(JU)
-U+3220:1c
-U+3221:2c
-U+3222:3c
-U+3223:4c
-U+3224:5c
-U+3225:6c
-U+3226:7c
-U+3227:8c
-U+3228:9c
-U+3229:10c
-U+327f:KSC
-U+33c2:am
-U+33d8:pm
-U+fb00:ff
-U+fb01:fi
-U+fb02:fl
-U+fb03:ffi
-U+fb04:ffl
-U+fb05:St
-U+fb06:st
-U+fe7d:3+;
-U+fe82:aM.
-U+fe84:aH.
-U+fe88:ah.
-U+fe8d:a+-
-U+fe8e:a+.
-U+fe8f:b+-
-U+fe90:b+.
-U+fe91:b+,
-U+fe92:b+;
-U+fe93:tm-
-U+fe94:tm.
-U+fe95:t+-
-U+fe96:t+.
-U+fe97:t+,
-U+fe98:t+;
-U+fe99:tk-
-U+fe9a:tk.
-U+fe9b:tk,
-U+fe9c:tk;
-U+fe9d:g+-
-U+fe9e:g+.
-U+fe9f:g+,
-U+fea0:g+;
-U+fea1:hk-
-U+fea2:hk.
-U+fea3:hk,
-U+fea4:hk;
-U+fea5:x+-
-U+fea6:x+.
-U+fea7:x+,
-U+fea8:x+;
-U+fea9:d+-
-U+feaa:d+.
-U+feab:dk-
-U+feac:dk.
-U+fead:r+-
-U+feae:r+.
-U+feaf:z+-
-U+feb0:z+.
-U+feb1:s+-
-U+feb2:s+.
-U+feb3:s+,
-U+feb4:s+;
-U+feb5:sn-
-U+feb6:sn.
-U+feb7:sn,
-U+feb8:sn;
-U+feb9:c+-
-U+feba:c+.
-U+febb:c+,
-U+febc:c+;
-U+febd:dd-
-U+febe:dd.
-U+febf:dd,
-U+fec0:dd;
-U+fec1:tj-
-U+fec2:tj.
-U+fec3:tj,
-U+fec4:tj;
-U+fec5:zH-
-U+fec6:zH.
-U+fec7:zH,
-U+fec8:zH;
-U+fec9:e+-
-U+feca:e+.
-U+fecb:e+,
-U+fecc:e+;
-U+fecd:i+-
-U+fece:i+.
-U+fecf:i+,
-U+fed0:i+;
-U+fed1:f+-
-U+fed2:f+.
-U+fed3:f+,
-U+fed4:f+;
-U+fed5:q+-
-U+fed6:q+.
-U+fed7:q+,
-U+fed8:q+;
-U+fed9:k+-
-U+feda:k+.
-U+fedb:k+,
-U+fedc:k+;
-U+fedd:l+-
-U+fede:l+.
-U+fedf:l+,
-U+fee0:l+;
-U+fee1:m+-
-U+fee2:m+.
-U+fee3:m+,
-U+fee4:m+;
-U+fee5:n+-
-U+fee6:n+.
-U+fee7:n+,
-U+fee8:n+;
-U+fee9:h+-
-U+feea:h+.
-U+feeb:h+,
-U+feec:h+;
-U+feed:w+-
-U+feee:w+.
-U+feef:j+-
-U+fef0:j+.
-U+fef1:y+-
-U+fef2:y+.
-U+fef3:y+,
-U+fef4:y+;
-U+fef5:lM-
-U+fef6:lM.
-U+fef7:lH-
-U+fef8:lH.
-U+fef9:lh-
-U+fefa:lh.
-U+fefb:la-
-U+fefc:la.
-U+0000:NU
-U+0001:SH
-U+0002:SX
-U+0003:EX
-U+0004:ET
-U+0005:EQ
-U+0006:AK
-U+0007:BL
-U+0008:BS
-U+0009:HT
-U+000a:LF
-U+000b:VT
-U+000c:FF
-U+000d:CR
-U+000e:SO
-U+000f:SI
-U+0010:DL
-U+0011:D1
-U+0012:D2
-U+0013:D3
-U+0014:D4
-U+0015:NK
-U+0016:SY
-U+0017:EB
-U+0018:CN
-U+0019:EM
-U+001a:SB
-U+001b:EC
-U+001c:FS
-U+001d:GS
-U+001e:RS
-U+001f:US
-U+007f:DT
-U+0080:PA
-U+0081:HO
-U+0082:BH
-U+0083:NH
-U+0084:IN
-U+0085:NL
-U+0086:SA
-U+0087:ES
-U+0088:HS
-U+0089:HJ
-U+008a:VS
-U+008b:PD
-U+008c:PU
-U+008d:RI
-U+008e:S2
-U+008f:S3
-U+0090:DC
-U+0091:P1
-U+0092:P2
-U+0093:TS
-U+0094:CC
-U+0095:MW
-U+0096:SG
-U+0097:EG
-U+0098:SS
-U+0099:GC
-U+009a:SC
-U+009b:CI
-U+009c:ST
-U+009d:OC
-U+009e:PM
-U+009f:AC
-# Characters in Private Use Area (e000-f8ff) do not have ussigned numbers
-# according Unicode 2.0
diff --git a/src/chrtrans/utf8_uni.tbl b/src/chrtrans/utf8_uni.tbl
deleted file mode 100644
index 88ad4925..00000000
--- a/src/chrtrans/utf8_uni.tbl
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This one is not really much of a "translation table", it mostly just
-# tells Lynx that "utf-8" is Unicode/UCS2 encoded in UTF8.  Note that
-# "unicode-1-1-utf-8" and "utf8" are treated as synonyms.
-#
-#The MIME name of this charset.
-Mutf-8
-
-#Name as a Display Charset (used on Options screen)
-OUNICODE (UTF-8)
-
-# Some kind of raw Unicode?
-# Use 6 for for really "raw" 16bit UCS-2, 7 for UTF-8, ...
-
-# most of these codes currently don't make much sense in a *.tbl file,
-# but for completeness (from UCDefs.h):
-#  #define UCT_ENC_7BIT 0
-#  #define UCT_ENC_8BIT 1
-#  #define UCT_ENC_8859 2
-#  #define UCT_ENC_8BIT_C0 3
-#  #define UCT_ENC_MAYBE2022 4
-#  #define UCT_ENC_CJK 5
-#  #define UCT_ENC_16BIT 6
-#  #define UCT_ENC_UTF8 7
-
-R 7
-
-#Shall this become the "default" translation?
-#There has to be exactly one table marked as "default".
-Default NO
-
-# Don't fall back to default table for unicode -> 8bit
-Fallback NO
-
-0x20-0x7f	idem
diff --git a/src/chrtrans/viscii_uni.tbl b/src/chrtrans/viscii_uni.tbl
deleted file mode 100644
index 617f1e1f..00000000
--- a/src/chrtrans/viscii_uni.tbl
+++ /dev/null
@@ -1,300 +0,0 @@
-#
-# Unicode mapping table for VISCII 1.1 fonts and charset=viscii,
-# described in RFC 1456.
-# See also <URL:http://www.trichlor.org/vietstd/report/rep92.htm>,
-# also for testing.
-# The 6 characters encoded in the C0 control region should not
-# be passed through to the terminal but be mapped to VIQR strings.
-# THe two changed mappings of MacVISCII are recognized in documents.
-
-# [convert with makeuctb]
-#
-#The MIME name of this charset.
-Mviscii
-
-#Name as a Display Charset (used on Options screen).
-OVietnamese (VISCII)
-
-# Special 'enc' flag to signal that some C0 characters are used.
-# Tables with R3 should properly map the allowed C0 control chars!
-#
-# most of these codes currently don't make much sense in a *.tbl file,
-# but for completeness (from UCDefs.h):
-#  #define UCT_ENC_7BIT 0
-#  #define UCT_ENC_8BIT 1
-#  #define UCT_ENC_8859 2
-#  #define UCT_ENC_8BIT_C0 3
-#  #define UCT_ENC_MAYBE2022 4
-#  #define UCT_ENC_CJK 5
-#  #define UCT_ENC_16BIT 6
-#  #define UCT_ENC_UTF8 7
-
-R 3
-
-#0x00	U+0000
-#0x01	U+0001
-#0x03	U+0003
-#0x04	U+0004
-#0x07	U+0007
-#0x08	U+0008
-0x09	U+0009
-0x0a	U+000a
-#0x0b	U+000b
-0x0c	U+000c
-U+000c " "
-0x0d	U+000d
-#0x0e	U+000e
-#0x0f	U+000f
-#0x10	U+0010
-#0x11	U+0011
-#0x12	U+0012
-#0x13	U+0013
-#0x15	U+0015
-#0x16	U+0016
-#0x17	U+0017
-#0x18	U+0018
-0x1a	U+001a
-U+001a:^Z
-#0x1b	U+001b
-#0x1c	U+001c
-#0x1d	U+001d
-#0x1f	U+001f
-#0x20	U+0020
-#0x21	U+0021
-#0x22	U+0022
-#0x23	U+0023
-#0x24	U+0024
-#0x25	U+0025
-#0x26	U+0026
-#0x27	U+0027
-#0x28	U+0028
-#0x29	U+0029
-#0x2a	U+002a
-#0x2b	U+002b
-#0x2c	U+002c
-#0x2d	U+002d
-#0x2e	U+002e
-#0x2f	U+002f
-#0x30	U+0030
-#0x31	U+0031
-#0x32	U+0032
-#0x33	U+0033
-#0x34	U+0034
-#0x35	U+0035
-#0x36	U+0036
-#0x37	U+0037
-#0x38	U+0038
-#0x39	U+0039
-#0x3a	U+003a
-#0x3b	U+003b
-#0x3c	U+003c
-#0x3d	U+003d
-#0x3e	U+003e
-#0x3f	U+003f
-#0x40	U+0040
-#0x41	U+0041
-#0x42	U+0042
-#0x43	U+0043
-#0x44	U+0044
-#0x45	U+0045
-#0x46	U+0046
-#0x47	U+0047
-#0x48	U+0048
-#0x49	U+0049
-#0x4a	U+004a
-#0x4b	U+004b
-#0x4c	U+004c
-#0x4d	U+004d
-#0x4e	U+004e
-#0x4f	U+004f
-#0x50	U+0050
-#0x51	U+0051
-#0x52	U+0052
-#0x53	U+0053
-#0x54	U+0054
-#0x55	U+0055
-#0x56	U+0056
-#0x57	U+0057
-#0x58	U+0058
-#0x59	U+0059
-#0x5a	U+005a
-#0x5b	U+005b
-#0x5c	U+005c
-#0x5d	U+005d
-#0x5e	U+005e
-#0x5f	U+005f
-#0x60	U+0060
-#0x61	U+0061
-#0x62	U+0062
-#0x63	U+0063
-#0x64	U+0064
-#0x65	U+0065
-#0x66	U+0066
-#0x67	U+0067
-#0x68	U+0068
-#0x69	U+0069
-#0x6a	U+006a
-#0x6b	U+006b
-#0x6c	U+006c
-#0x6d	U+006d
-#0x6e	U+006e
-#0x6f	U+006f
-#0x70	U+0070
-#0x71	U+0071
-#0x72	U+0072
-#0x73	U+0073
-#0x74	U+0074
-#0x75	U+0075
-#0x76	U+0076
-#0x77	U+0077
-#0x78	U+0078
-#0x79	U+0079
-#0x7a	U+007a
-#0x7b	U+007b
-#0x7c	U+007c
-#0x7d	U+007d
-#0x7e	U+007e
-#0x7f	U+007f
-0xc0	U+00c0
-0xc1	U+00c1
-0xc2	U+00c2
-0xc3	U+00c3
-0xc8	U+00c8
-0xc9	U+00c9
-0xca	U+00ca
-0xcc	U+00cc
-0xcd	U+00cd
-0xd2	U+00d2
-0xd3	U+00d3
-0xd4	U+00d4
-0xa0	U+00d5
-0xd9	U+00d9
-0xda	U+00da
-0xdd	U+00dd
-0xe0	U+00e0
-0xe1	U+00e1
-0xe2	U+00e2
-0xe3	U+00e3
-0xe8	U+00e8
-0xe9	U+00e9
-0xea	U+00ea
-0xec	U+00ec
-0xed	U+00ed
-0xf2	U+00f2
-0xf3	U+00f3
-0xf4	U+00f4
-0xf5	U+00f5
-0xf9	U+00f9
-0xfa	U+00fa
-0xfd	U+00fd
-0xc5	U+0102
-0xe5	U+0103
-0xd0	U+0110
-0xf0	U+0111 U+00f0  # "edh" is similar enough to map it here
-0xce	U+0128
-0xee	U+0129
-0x9d	U+0168
-0xfb	U+0169
-0xb4	U+01a0
-0xbd	U+01a1
-0xbf	U+01af
-0xdf	U+01b0
-0x80	U+1ea0
-0xd5	U+1ea1
-0xc4	U+1ea2
-0xe4	U+1ea3
-0x84	U+1ea4
-0xa4	U+1ea5
-0x85	U+1ea6
-0xa5	U+1ea7
-0x86	U+1ea8
-0xa6	U+1ea9
-0x06	U+1eaa
-U+1eaa "\302~"  # A with circumflex (same code as in iso-8859-1) and tilde
-0xe7	U+1eab
-0x87	U+1eac
-0xa7	U+1ead
-0x81	U+1eae
-0xa1	U+1eaf
-0x82	U+1eb0
-0xa2	U+1eb1
-0x02	U+1eb2
-U+1eb2:A(?
-0xc6	U+1eb3
-0x05	U+1eb4
-U+1eb4:A(~
-0xc7	U+1eb5
-0x83	U+1eb6
-0xa3	U+1eb7
-0x89	U+1eb8
-0xa9	U+1eb9
-0xcb	U+1eba
-0xeb	U+1ebb
-0x88	U+1ebc
-0xa8	U+1ebd
-0x8a	U+1ebe
-0xaa	U+1ebf
-0x8b	U+1ec0
-0xab	U+1ec1
-0x8c	U+1ec2
-0xac	U+1ec3
-0x8d	U+1ec4
-0xad	U+1ec5
-0x8e	U+1ec6
-0xae	U+1ec7
-0x9b	U+1ec8
-0xef	U+1ec9
-0x98	U+1eca
-0xb8	U+1ecb
-0x9a	U+1ecc
-0xf7	U+1ecd
-0x99	U+1ece
-0xf6	U+1ecf
-0x8f	U+1ed0
-0xaf	U+1ed1
-0x90	U+1ed2
-0xb0	U+1ed3
-0x91	U+1ed4
-0xb1	U+1ed5
-0x92	U+1ed6
-0xb2	U+1ed7
-0x93	U+1ed8
-0xb5	U+1ed9
-0x95	U+1eda
-0xbe	U+1edb
-0x96	U+1edc
-0xb6	U+1edd
-0x97	U+1ede
-0xb7	U+1edf
-0xb3	U+1ee0
-0xde	U+1ee1
-0x94	U+1ee2
-0xfe	U+1ee3
-0x9e	U+1ee4
-0xf8	U+1ee5
-0x9c	U+1ee6
-0xfc	U+1ee7
-0xba	U+1ee8
-0xd1	U+1ee9
-0xbb	U+1eea
-0xd7	U+1eeb
-0xbc	U+1eec
-0xd8	U+1eed
-0xff	U+1eee
-0xe6	U+1eef
-0xb9	U+1ef0
-0xf1	U+1ef1
-0x9f	U+1ef2
-0xcf	U+1ef3
-0x18	U+1ef4   # MacVISCII
-0x1e	U+1ef4
-U+1ef4:Y.
-0xdc	U+1ef5
-0x17	U+1ef6   # MacVISCII
-0x14	U+1ef6
-U+1ef6:Y?
-0xd6	U+1ef7
-0x19	U+1ef8
-U+1ef8:Y~
-0xdb	U+1ef9
-
diff --git a/src/parsdate.c b/src/parsdate.c
index 7fa2ba5e..e95869f5 100644
--- a/src/parsdate.c
+++ b/src/parsdate.c
@@ -33,7 +33,7 @@ static int yygrowstack(void);
 #define YYPREFIX "yy"
 #line 2 "parsdate.y"
 /*
- *  $LynxId: parsdate.c,v 1.3 2008/08/31 16:04:04 tom Exp $
+ *  $LynxId: parsdate.c,v 1.4 2008/09/23 23:13:34 tom Exp $
  *
  *  This module is adapted and extended from tin, to use for LYmktime().
  *
@@ -75,7 +75,7 @@ static int yygrowstack(void);
 
 #define CTYPE(isXXXXX, c)	(((unsigned char)(c) < 128) && isXXXXX(((int)c)))
 
-typedef char	*STRING;
+typedef char	*PD_STRING;
 
 extern int date_parse(void);
 
@@ -727,7 +727,7 @@ LookupWord(
     length++;
 
     /* Drop out any periods. */
-    for (p = buff, q = (STRING)buff; *q; q++)
+    for (p = buff, q = (PD_STRING)buff; *q; q++)
 	if (*q != '.')
 	    *p++ = *q;
     *p = '\0';
diff --git a/src/parsdate.y b/src/parsdate.y
index 54900ffb..77cc7e94 100644
--- a/src/parsdate.y
+++ b/src/parsdate.y
@@ -1,6 +1,6 @@
 %{
 /*
- *  $LynxId: parsdate.y,v 1.5 2008/07/01 20:14:24 tom Exp $
+ *  $LynxId: parsdate.y,v 1.6 2008/09/23 23:13:34 tom Exp $
  *
  *  This module is adapted and extended from tin, to use for LYmktime().
  *
@@ -42,7 +42,7 @@
 
 #define CTYPE(isXXXXX, c)	(((unsigned char)(c) < 128) && isXXXXX(((int)c)))
 
-typedef char	*STRING;
+typedef char	*PD_STRING;
 
 extern int date_parse(void);
 
@@ -702,7 +702,7 @@ LookupWord(
     length++;
 
     /* Drop out any periods. */
-    for (p = buff, q = (STRING)buff; *q; q++)
+    for (p = buff, q = (PD_STRING)buff; *q; q++)
 	if (*q != '.')
 	    *p++ = *q;
     *p = '\0';